From 53c65d18b140a02b58b50467ce55ed1922a0cf05 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Jun 2021 16:22:06 +0200
Subject: update to 8.1.0-dev

---
 php.spec | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index d9a2aa5..14cff68 100644
--- a/php.spec
+++ b/php.spec
@@ -1,4 +1,4 @@
-# remirepo spec file for php80-php
+# remirepo spec file for php81-php
 # with SCL and backport stuff, adapted from
 #
 # Fedora spec file for php
@@ -23,8 +23,8 @@
 %endif
 
 # API/ABI check
-%global apiver      20200930
-%global zendver     20200930
+%global apiver      20201009
+%global zendver     20201009
 %global pdover      20170320
 # Extension version
 %global oci8ver     3.0.1
@@ -33,7 +33,7 @@
 %global _hardened_build 1
 
 # version used for php embedded library soname
-%global embed_version 8.0
+%global embed_version 8.1
 
 # Ugly hack. Harcoded values to avoid relocation.
 %global _httpd_mmn         %(cat %{_root_includedir}/httpd/.mmn 2>/dev/null || echo 0)
@@ -93,14 +93,14 @@
 %global with_httpd2410 0
 %endif
 
-%global gh_commit    18f2ef094af2b1ad961408fbaf222b9448df2750
+%global gh_commit    953143d8503cd0e861f02d7262f2304dbb58ec5c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-#global gh_date      20200615
+%global gh_date      20210604
 %global gh_owner     php
 %global gh_project   php-src
-%global upver        8.0.7
-#global rcver        RC1
-#global lower        RC1
+%global upver        8.1.0
+#global rcver        dev
+%global lower        DEV
 
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
@@ -145,8 +145,6 @@ Patch1: php-7.4.0-httpd.patch
 Patch5: php-7.2.0-includedir.patch
 Patch6: php-8.0.0-embed.patch
 Patch8: php-7.4.0-libdb.patch
-# get rid of deprecated functions from 8.1
-Patch9: php-8.0.6-deprecated.patch
 # RHEL backports
 Patch10: php-7.0.7-curl.patch
 
@@ -154,14 +152,14 @@ Patch10: php-7.0.7-curl.patch
 # Use system nikic/php-parser
 Patch41: php-8.0.0-parser.patch
 # use system tzdata
-Patch42: php-8.0.0-systzdata-v19.patch
+Patch42: php-8.1.0-systzdata-v20.patch
 # See http://bugs.php.net/53436
 Patch43: php-7.4.0-phpize.patch
 # Use -lldap_r for OpenLDAP
 Patch45: php-7.4.0-ldap_r.patch
 # drop "Configure command" from phpinfo output
 # and only use gcc (instead of full version)
-Patch47: php-8.0.0-phpinfo.patch
+Patch47: php-8.1.0-phpinfo.patch
 
 # RC Patch
 Patch91: php-7.2.0-oci8conf.patch
@@ -188,7 +186,7 @@ BuildRequires: httpd-filesystem
 %endif
 BuildRequires: %{?dtsprefix}libstdc++-devel
 # no pkgconfig to avoid compat-openssl10
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.0.2
 BuildRequires: pkgconfig(sqlite3) >= 3.7.4
 BuildRequires: pkgconfig(zlib) >= 1.2.0.4
 BuildRequires: smtpdaemon
@@ -393,7 +391,7 @@ Requires: libtool
 # see "php-config --libs"
 Requires: krb5-devel%{?_isa}
 Requires: libxml2-devel%{?_isa}
-Requires: openssl-devel%{?_isa} >= 1.0.1
+Requires: openssl-devel%{?_isa} >= 1.0.2
 %if %{with libpcre}
 Requires: pcre2-devel%{?_isa} >= 10.30
 %endif
@@ -431,7 +429,7 @@ License: PHP
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(krb5)
 BuildRequires: pkgconfig(krb5-gssapi)
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.0.2
 BuildRequires: libc-client-devel
 
 %description imap
@@ -447,7 +445,7 @@ License: PHP
 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
 BuildRequires: pkgconfig(libsasl2)
 BuildRequires: openldap-devel
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.0.2
 
 %description ldap
 The %{?scl_prefix}php-ldap package adds Lightweight Directory Access Protocol (LDAP)
@@ -501,7 +499,7 @@ Requires: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release}
 Provides: %{?scl_prefix}php_database
 Provides: %{?scl_prefix}php-pdo_pgsql, %{?scl_prefix}php-pdo_pgsql%{?_isa}
 BuildRequires: krb5-devel
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.0.2
 BuildRequires: postgresql-devel
 
 %description pgsql
@@ -915,7 +913,6 @@ in pure PHP.
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch8 -p1 -b .libdb
-%patch9 -p1 -b .deprecated
 %if 0%{?rhel}
 %patch10 -p1 -b .curltls
 %endif
@@ -1807,6 +1804,9 @@ fi
 
 
 %changelog
+* Fri Jun  4 2021 Remi Collet <remi@remirepo.net> - 8.1.0~DEV.20210604-1
+- update to 8.1.0-dev
+
 * Wed Jun  2 2021 Remi Collet <remi@remirepo.net> - 8.0.7-1
 - Update to 8.0.7 - http://www.php.net/releases/8_0_7.php
 
-- 
cgit