summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt11
-rw-r--r--php-7.0.7-curl.patch15
-rw-r--r--php-8.2.0-curl.patch23
-rw-r--r--php.spec20
4 files changed, 42 insertions, 27 deletions
diff --git a/failed.txt b/failed.txt
index ccbbb8d..6eece94 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 8.2.0beta3 (2022-08-18)
+===== 8.2.0RC1 (2022-09-01)
$ grep -ar 'Tests failed' /var/lib/mock/*/build.log
@@ -6,13 +6,12 @@ $ grep -ar 'Tests failed' /var/lib/mock/*/build.log
/var/lib/mock/scl81el8x/build.log:Tests failed : 3
/var/lib/mock/scl81el9x/build.log:Tests failed : 2
/var/lib/mock/scl81fc35x/build.log:Tests failed : 2
-/var/lib/mock/scl81fc36x/build.log:Tests failed : 1
+/var/lib/mock/scl81fc36x/build.log:Tests failed : 2
-el7x, el8x, el9x, fc35x, fc36x:
- 2 Zend/tests/traits/constant_016.phpt
-el7x, el8x, el9x, fc35x:
- 4 ext/date/tests/bug33415-2.phpt
+all:
+ 2 FPM: GH-8885 - access.log with stderr begins to write logs to error_log after daemon reload [sapi/fpm/tests/gh8885-stderr-fd-reload-usr2.phpt]
+ 2 FPM: GH-8885 - access.log with stderr begins to write logs to error_log after daemon reload [sapi/fpm/tests/gh8885-stderr-fd-reload-usr1.phpt]
el8x:
3 Test setlocale() function : usage variations - Setting all available locales in the platform [ext/standard/tests/strings/setlocale_variation2.phpt]
diff --git a/php-7.0.7-curl.patch b/php-7.0.7-curl.patch
deleted file mode 100644
index 218db98..0000000
--- a/php-7.0.7-curl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up php-7.0.7RC1/ext/curl/interface.c.curltls php-7.0.7RC1/ext/curl/interface.c
---- php-7.0.7RC1/ext/curl/interface.c.curltls 2016-05-10 17:28:33.000000000 +0200
-+++ php-7.0.7RC1/ext/curl/interface.c 2016-05-12 07:43:00.900419946 +0200
-@@ -1257,7 +1257,11 @@ PHP_MINIT_FUNCTION(curl)
-
- #if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
- REGISTER_CURL_CONSTANT(CURLOPT_LOGIN_OPTIONS);
-+#endif
-
-+#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.19.0 (in upstream curl 7.34)
-+ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136
-+ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */
- REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_0);
- REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_1);
- REGISTER_CURL_CONSTANT(CURL_SSLVERSION_TLSv1_2);
diff --git a/php-8.2.0-curl.patch b/php-8.2.0-curl.patch
new file mode 100644
index 0000000..e581310
--- /dev/null
+++ b/php-8.2.0-curl.patch
@@ -0,0 +1,23 @@
+diff -up ./ext/curl/curl_arginfo.h.bck ./ext/curl/curl_arginfo.h
+--- ./ext/curl/curl_arginfo.h.bck 2022-09-01 09:46:21.410502957 +0200
++++ ./ext/curl/curl_arginfo.h 2022-09-01 09:47:16.020506046 +0200
+@@ -723,13 +723,16 @@ static void register_curl_symbols(int mo
+ #if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
+ REGISTER_LONG_CONSTANT("CURLOPT_LOGIN_OPTIONS", CURLOPT_LOGIN_OPTIONS, CONST_PERSISTENT);
+ #endif
+-#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
++/* Available since 7.19.0 (in upstream curl 7.34)
++ backported in RHEL-7 curl-7.29.0-16.el7 rhbz#1012136
++ backported in RHEL-6 curl-7.19.7-43.el6 rhbz#1036789 */
++#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.34.0 */
+ REGISTER_LONG_CONSTANT("CURL_SSLVERSION_TLSv1_0", CURL_SSLVERSION_TLSv1_0, CONST_PERSISTENT);
+ #endif
+-#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
++#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.34.0 */
+ REGISTER_LONG_CONSTANT("CURL_SSLVERSION_TLSv1_1", CURL_SSLVERSION_TLSv1_1, CONST_PERSISTENT);
+ #endif
+-#if LIBCURL_VERSION_NUM >= 0x072200 /* Available since 7.34.0 */
++#if LIBCURL_VERSION_NUM >= 0x071300 /* Available since 7.34.0 */
+ REGISTER_LONG_CONSTANT("CURL_SSLVERSION_TLSv1_2", CURL_SSLVERSION_TLSv1_2, CONST_PERSISTENT);
+ #endif
+ #if LIBCURL_VERSION_NUM >= 0x072400 /* Available since 7.36.0 */
diff --git a/php.spec b/php.spec
index 639b458..2cfcd0d 100644
--- a/php.spec
+++ b/php.spec
@@ -23,8 +23,8 @@
%endif
# API/ABI check
-%global apiver 20210903
-%global zendver 20210903
+%global apiver 20220829
+%global zendver 20220829
%global pdover 20170320
# Extension version
%global oci8ver 3.2.1
@@ -123,13 +123,13 @@
%global gh_owner php
%global gh_project php-src
%global upver 8.2.0
-%global rcver beta3
+%global rcver RC1
%global lower %(echo %{rcver} | tr '[:upper:]' '[:lower:]')
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 11%{?dist}
+Release: 12%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -171,7 +171,7 @@ Patch5: php-7.2.0-includedir.patch
Patch6: php-8.0.0-embed.patch
Patch8: php-8.1.0-libdb.patch
# RHEL backports
-Patch10: php-7.0.7-curl.patch
+Patch10: php-8.2.0-curl.patch
# Functional changes
# Use system nikic/php-parser
@@ -949,7 +949,7 @@ in pure PHP.
%patch5 -p1 -b .includedir
%patch6 -p1 -b .embed
%patch8 -p1 -b .libdb
-%if 0%{?rhel}
+%if 0%{?rhel} == 7
%patch10 -p1 -b .curltls
%endif
@@ -999,6 +999,10 @@ mkdir \
rm ext/date/tests/timezone_location_get.phpt
rm ext/date/tests/bug80963.phpt
%endif
+%if 0%{?fedora} < 36
+# need tzdata 2022b
+rm ext/date/tests/bug33415-2.phpt
+%endif
# too fast builder
rm ext/date/tests/bug73837.phpt
# fails sometime
@@ -1844,6 +1848,10 @@ fi
%changelog
+* Thu Sep 1 2022 Remi Collet <remi@remirepo.net> - 8.2.0~rc1-12
+- update to 8.2.0RC1
+- bump to final API/ABI
+
* Wed Aug 17 2022 Remi Collet <remi@remirepo.net> - 8.2.0~beta3-11
- update to 8.2.0beta3
- use oracle client library version 21.7