summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt10
-rw-r--r--php-5.6.3-embed.patch2
-rw-r--r--php-5.6.3-phpinfo.patch29
-rw-r--r--php-7.2.4-fixheader.patch12
-rw-r--r--php-7.3.20-fixheader.patch13
-rw-r--r--php-7.3.20-phpinfo.patch76
-rw-r--r--php-keyring.gpg387
-rw-r--r--php.ini7
-rw-r--r--php.spec94
9 files changed, 276 insertions, 354 deletions
diff --git a/failed.txt b/failed.txt
index 09acfd4..fe645e2 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,19 +1,17 @@
-===== 7.3.12RC1 (2019-11-07)
+===== 7.3.21RC1 (2020-07-23)
$ grep -ar 'Tests failed' /var/lib/mock/scl73*/build.log
/var/lib/mock/scl73el6x/build.log:Tests failed : 0
-/var/lib/mock/scl73el7x/build.log:Tests failed : 1
+/var/lib/mock/scl73el7x/build.log:Tests failed : 0
/var/lib/mock/scl73el8x/build.log:Tests failed : 14
-/var/lib/mock/scl73fc29x/build.log:Tests failed : 0
/var/lib/mock/scl73fc30x/build.log:Tests failed : 0
/var/lib/mock/scl73fc31x/build.log:Tests failed : 0
+/var/lib/mock/scl73fc32x/build.log:Tests failed : 0
-el7x
- 1 php://input is empty when enable_post_data_reading=Off [tests/basic/bug67198.phpt]
el8x
- 5 buildroot issue (openssl)
+ 2 buildroot issue with openssl under investigation
(1) proc_open give erratic test results :(
diff --git a/php-5.6.3-embed.patch b/php-5.6.3-embed.patch
index d9c04f6..38eea1d 100644
--- a/php-5.6.3-embed.patch
+++ b/php-5.6.3-embed.patch
@@ -18,7 +18,7 @@ diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in
php_cgi_binary=NONE
configure_options="@CONFIGURE_OPTIONS@"
-php_sapis="@PHP_INSTALLED_SAPIS@"
-+php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@"
++php_sapis="apache2handler embed fpm phpdbg @PHP_INSTALLED_SAPIS@"
# Set php_cli_binary and php_cgi_binary if available
for sapi in $php_sapis; do
diff --git a/php-5.6.3-phpinfo.patch b/php-5.6.3-phpinfo.patch
deleted file mode 100644
index 086be15..0000000
--- a/php-5.6.3-phpinfo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-
-Drop "Configure Command" from phpinfo as it doesn't
-provide any useful information.
-The available extensions are not related to this command.
-
-diff -up php-7.0.0RC1/ext/standard/info.c.phpinfo php-7.0.0RC1/ext/standard/info.c
---- php-7.0.0RC1/ext/standard/info.c.phpinfo 2015-08-18 23:39:24.000000000 +0200
-+++ php-7.0.0RC1/ext/standard/info.c 2015-08-22 07:56:18.344761928 +0200
-@@ -870,9 +870,6 @@ PHPAPI void php_print_info(int flag)
- #ifdef ARCHITECTURE
- php_info_print_table_row(2, "Architecture", ARCHITECTURE);
- #endif
--#ifdef CONFIGURE_COMMAND
-- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
--#endif
-
- if (sapi_module.pretty_name) {
- php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
-diff -up php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt
---- php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2015-08-18 23:39:22.000000000 +0200
-+++ php-7.0.0RC1/ext/standard/tests/general_functions/phpinfo.phpt 2015-08-22 07:56:18.344761928 +0200
-@@ -20,7 +20,6 @@ PHP Version => %s
-
- System => %s
- Build Date => %s%a
--Configure Command => %s
- Server API => Command Line Interface
- Virtual Directory Support => %s
- Configuration File (php.ini) Path => %s
diff --git a/php-7.2.4-fixheader.patch b/php-7.2.4-fixheader.patch
deleted file mode 100644
index 52a4121..0000000
--- a/php-7.2.4-fixheader.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac
---- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100
-+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100
-@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d`
- fi
- AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
-
--PHP_UNAME=`uname -a | xargs`
-+PHP_UNAME=`uname | xargs`
- AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
- PHP_OS=`uname | xargs`
- AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
diff --git a/php-7.3.20-fixheader.patch b/php-7.3.20-fixheader.patch
new file mode 100644
index 0000000..6bbdfbd
--- /dev/null
+++ b/php-7.3.20-fixheader.patch
@@ -0,0 +1,13 @@
+diff -up ./configure.ac.fixheader ./configure.ac
+--- ./configure.ac.fixheader 2020-07-06 16:04:56.069183751 +0200
++++ ./configure.ac 2020-07-06 16:05:52.044046238 +0200
+@@ -1350,7 +1350,8 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d`
+ fi
+ AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date])
+
+-PHP_UNAME=`uname -a | xargs`
++UNAME=`uname -a | xargs`
++PHP_UNAME=${PHP_UNAME:-$UNAME}
+ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
+ PHP_OS=`uname | xargs`
+ AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
diff --git a/php-7.3.20-phpinfo.patch b/php-7.3.20-phpinfo.patch
new file mode 100644
index 0000000..8118732
--- /dev/null
+++ b/php-7.3.20-phpinfo.patch
@@ -0,0 +1,76 @@
+
+Drop "Configure Command" from phpinfo as it doesn't
+provide any useful information.
+The available extensions are not related to this command.
+
+diff -up a/ext/standard/info.c.phpinfo v/ext/standard/info.c
+--- a/ext/standard/info.c.phpinfo 2015-08-18 23:39:24.000000000 +0200
++++ b/ext/standard/info.c 2015-08-22 07:56:18.344761928 +0200
+@@ -829,9 +829,6 @@ PHPAPI void php_print_info(int flag)
+ #ifdef ARCHITECTURE
+ php_info_print_table_row(2, "Architecture", ARCHITECTURE);
+ #endif
+-#ifdef CONFIGURE_COMMAND
+- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
+-#endif
+
+ if (sapi_module.pretty_name) {
+ php_info_print_table_row(2, "Server API", sapi_module.pretty_name );
+diff -up a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo b/ext/standard/tests/general_functions/phpinfo.phpt
+--- a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2015-08-18 23:39:22.000000000 +0200
++++ b/ext/standard/tests/general_functions/phpinfo.phpt 2015-08-22 07:56:18.344761928 +0200
+@@ -20,7 +20,6 @@ PHP Version => %s
+
+ System => %s
+ Build Date => %s%a
+-Configure Command => %s
+ Server API => Command Line Interface
+ Virtual Directory Support => %s
+ Configuration File (php.ini) Path => %s
+
+
+Backported from 8.0:
+
+From ad0d2e438fddc089917e71e5d8909d145db9da8a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 3 Jul 2020 10:08:09 +0200
+Subject: [PATCH] display info about system used to build and its provider
+
+---
+ configure.ac | 5 +++++
+ ext/standard/info.c | 6 ++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index d9e6329314a3..77f12a55569a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1355,6 +1355,11 @@ PHP_UNAME=${PHP_UNAME:-$UNAME}
+ AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
+ PHP_OS=`uname | xargs`
+ AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
++PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME}
++AC_DEFINE_UNQUOTED(PHP_BUILD_SYSTEM,"$PHP_BUILD_SYSTEM",[builder uname output])
++if test -n "${PHP_BUILD_PROVIDER}"; then
++ AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider])
++fi
+
+ PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
+
+diff --git a/ext/standard/info.c b/ext/standard/info.c
+index 262e95ae2731..f652efd23657 100644
+--- a/ext/standard/info.c
++++ b/ext/standard/info.c
+@@ -823,6 +823,12 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
+ php_info_print_table_start();
+ php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
+ php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
++#ifdef PHP_BUILD_SYSTEM
++ php_info_print_table_row(2, "Build System", PHP_BUILD_SYSTEM);
++#endif
++#ifdef PHP_BUILD_PROVIDER
++ php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER);
++#endif
+ #ifdef COMPILER
+ php_info_print_table_row(2, "Compiler", COMPILER);
+ #endif
diff --git a/php-keyring.gpg b/php-keyring.gpg
index 986f7f4..b5318b2 100644
--- a/php-keyring.gpg
+++ b/php-keyring.gpg
@@ -46,48 +46,7 @@ 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
-54yw10CZAy4ET2apoBEIAIVKpwaY26eSNBC7df7JedOYV4SS8zgldlM4F1HxoR68
-0aaYUR/K+NoONaL2FzCngT+Vi0L4/tWxWMzU5Jf16rSML+UYvRnJFd6T6Y3LSfkf
-U1K5Ol/1jXwsyqFzgb5FT4tw2Jn0rQMm44680s/Fbs4dmC7FvfB0o9c1VraPJF8k
-Aqba5okkxPWZOYVP1rRDxIqv6ZSusmS4bQfajpLOsq3xbCiKe3V6HrvNWwlom1AV
-yGcRmeVrAhyo/bILicsZHcyS5ujDGgQFgJl63XxodVVFu+kbZC2hvwu7nGuwZuZf
-KZOQdN2m+R9wkUANrwzM4v3TM7FfBsZ9shk6WHkSfyMBAJeV+fHZ5AvcFJb/pcA1
-rnV1taISnV3UECSkYq1m+WTRB/4z1YCL71pcx7fE/mSvG2CdE1R/ZY3pl3LYzEvV
-FEkIVvK0uGXSuicLj0GwZhUayF0QfzGEFuIg4kq5Vn8NOX1sSbs/1zsILuInJUKS
-FQCGi4frHNlA0tH5FT5B5tjNfKlV+X31CTsR0yav9YBkIcu69qfKp6kLkQGxrdWc
-B9B6ZI2gF4YEpZYuI6w+O9Lvb7LXPhFQwB9cefiX+wUy3zO3v/vgCYk/Bmq5XjWn
-iY87XZXj7E/JzpGwHzix+yTZBWK9TzDwCS8ZB5iNejPsjBqj3n59a15XNnfopFC9
-RyQ/ykaMeUNecfEnQcjUj+Q4FlKPBHBR/R13vfLp6s+FsuT6B/410jcf0oYkHMbn
-+tXJYrBR5D13m53iNMlGRAa8A/mmDvq8Rr12iBul7hbln7QF9uIlKdCZBZIeJl12
-P+3fem1u6njgKTplOB2WYVgwsXWFHjs8hlMMoRES4pgZyL++ryydm8Qk/1gLD9O2
-Idwx2swpxj/4unyVA7QYcs8H2CVWGcLR1vqXVemDUIwjz9GjMExyKPfQSABOCAL/
-LbNuKoAWhL0U32dc9t7imFK2oAETJ5n6de523s9RhONWByuqjxsdkKKwGhtYLs6c
-rJTPFXHNR64+Qh+Zm7OQtozDYxxB2/DCw29DQPNos/fRzVeyb/sQhglw5anOVUnl
-Ct2YTT8FtDJTdGFuaXNsYXYgTWFseXNoZXYgKFBIUCBrZXkpIDxzbWFseXNoZXZA
-Z21haWwuY29tPoh6BBMRCAAiBQJPZqq0AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
-AQIXgAAKCRAveVa8XaBLXZczAP0e5EiiVLAgrvu7wRjjrXLa7qxtffqfn+6j8sNC
-7GiLewD/Qy+me/M6G/0i5+++xkSPcTuLeH6IPnrjxgzB9MUKKP60K1N0YW5pc2xh
-diBNYWx5c2hldiAoUEhQIGtleSkgPHN0YXNAcGhwLm5ldD6IegQTEQgAIgUCT2ap
-oAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQL3lWvF2gS12F2wD/WpBv
-lFluHo+UhV4cIUULd8y/LnrAnUoLSSeGmHJl1wYA/1tAWFYZvHKUWfvGadsnZulr
-7Rh/NFbBuCZ4hKhki1DVtDVTdGFuaXNsYXYgTWFseXNoZXYgKFBIUCBrZXkpIDxz
-bWFseXNoZXZAc3VnYXJjcm0uY29tPoh6BBMRCAAiBQJPZqqdAhsDBgsJCAcDAgYV
-CAIJCgsEFgIDAQIeAQIXgAAKCRAveVa8XaBLXWuhAP9L9/cztiAKFozxIC3v2IA+
-8uJ6mVQGBiC44mMdzXpADQD8CbSaMqY2rdbk/S4D+8H6WIIRwwt1xmI4iw0jjh4e
-Pk+5Ag0ET2apoBAIAN9k8ymNmSQZmPcFj/sCmguribCrNuH4KktfA2fbS0U29Jd9
-vxF15e9URvtJzH5b2pimJq6faJcmAJUfx+ClmlHznq6VPWrq4Ib74Je5sS+Kn94m
-RmX3f/ziHTgpAnCyA6sCHQ6bc549Gfw+v777Qs1LQQvy5f9gd5M4Y6eeZOphN7JI
-FUV2i/oviZ6l11+N6SJwpCqEvuZmH/G6rb0mKNPS401fy/i8NZAO7l2UBx1364He
-BxcwP8+CKcPXXOn7rC2tYKb/7IGqm8PBdBfk8ZSfC9tF+XsDLcybCaheJ5xkyDR3
-BNJzt7SWEHgcZEdl0EwkHisdRUZ3Oq6Mr9y06+sAAwUH/RS1vvpB7qwIyUfFUCZ4
-T99ujs+LTlu1n/HTWvrt0d9oxI/SuIIonszQ5b6MBe2737P8FWdiKxbrtZZ/GXZx
-Lm1kOCIeAkBFdZQ47vb6xJwc/wpCZOXXPXqDIpvBjdKbIGTByk4vfmeFRY0vL3ez
-I+hjqxlROKSvZtli6QcNDfdcE+zh7oxtYp+xr2ppWaeU4XeTlSoKGO618doRrhDt
-U/jAEimmEcGL0wjXqgkjPME9saXa6h52PCJnpB5BmdK45VhnFTZ3eVEDw+u18U3V
-VKWkSb9VwC+2J4dRhYc3TA675yndKWvlclU2NOMmGXbxKWKcwwTniYoAZ/Yt2v91
-HBeIYQQYEQgACQUCT2apoAIbDAAKCRAveVa8XaBLXboRAP9VV3cWCMsqCUKVFA/N
-19Tzju2oMrjMmNuZG/m8svCgTQD7ButCzuNUZTc2tLQAiXm9SZ7CmnYErNKR6nLb
-edaZ6PCZAg0EXP+o8QEQAOt/faLOy1ltLfFcIRJo0o/tS9eEcofNUDxDNeT9Q61F
+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
@@ -221,7 +180,48 @@ MNiyqtDslxMz5GOisD1iNKFznNjko3GExCGlzDmAArm0NQHkqJfXEFO86yLAkaAz
eoSOhDUlbLpLfAU0biJx8RSMK5rHdNETLBHbUY355r76SweGHlu2iAqIxEOEvUXn
OR4W420uy3DRlQY4MIeRLgNKkFrY3fHDot0h5Srvae74E2osLoWh95JujbbsuMVE
rrgwO/1hysVjmkdiU2UPkH1FB/iQHzP0FGCu5SQB+7+A2gq2hBSTQztqgPxygrHL
-hbzBVymcn9yJd96JnwVe5d1BrxFlxcfDDG/GBGqVB8MsufmjmQINBFjxRtoBEADk
+hbzBVymcn9yJd96JnwVe5d1BrxFlxcfDDG/GBGqVB8MsufmjmQMuBE9mqaARCACF
+SqcGmNunkjQQu3X+yXnTmFeEkvM4JXZTOBdR8aEevNGmmFEfyvjaDjWi9hcwp4E/
+lYtC+P7VsVjM1OSX9eq0jC/lGL0ZyRXek+mNy0n5H1NSuTpf9Y18LMqhc4G+RU+L
+cNiZ9K0DJuOOvNLPxW7OHZguxb3wdKPXNVa2jyRfJAKm2uaJJMT1mTmFT9a0Q8SK
+r+mUrrJkuG0H2o6SzrKt8Wwoint1eh67zVsJaJtQFchnEZnlawIcqP2yC4nLGR3M
+kubowxoEBYCZet18aHVVRbvpG2Qtob8Lu5xrsGbmXymTkHTdpvkfcJFADa8MzOL9
+0zOxXwbGfbIZOlh5En8jAQCXlfnx2eQL3BSW/6XANa51dbWiEp1d1BAkpGKtZvlk
+0Qf+M9WAi+9aXMe3xP5krxtgnRNUf2WN6Zdy2MxL1RRJCFbytLhl0ronC49BsGYV
+GshdEH8xhBbiIOJKuVZ/DTl9bEm7P9c7CC7iJyVCkhUAhouH6xzZQNLR+RU+QebY
+zXypVfl99Qk7EdMmr/WAZCHLuvanyqepC5EBsa3VnAfQemSNoBeGBKWWLiOsPjvS
+72+y1z4RUMAfXHn4l/sFMt8zt7/74AmJPwZquV41p4mPO12V4+xPyc6RsB84sfsk
+2QVivU8w8AkvGQeYjXoz7Iwao95+fWteVzZ36KRQvUckP8pGjHlDXnHxJ0HI1I/k
+OBZSjwRwUf0dd73y6erPhbLk+gf+NdI3H9KGJBzG5/rVyWKwUeQ9d5ud4jTJRkQG
+vAP5pg76vEa9dogbpe4W5Z+0BfbiJSnQmQWSHiZddj/t33ptbup44Ck6ZTgdlmFY
+MLF1hR47PIZTDKEREuKYGci/vq8snZvEJP9YCw/TtiHcMdrMKcY/+Lp8lQO0GHLP
+B9glVhnC0db6l1Xpg1CMI8/RozBMcij30EgATggC/y2zbiqAFoS9FN9nXPbe4phS
+tqABEyeZ+nXudt7PUYTjVgcrqo8bHZCisBobWC7OnKyUzxVxzUeuPkIfmZuzkLaM
+w2McQdvwwsNvQ0DzaLP30c1Xsm/7EIYJcOWpzlVJ5QrdmE0/BbQyU3RhbmlzbGF2
+IE1hbHlzaGV2IChQSFAga2V5KSA8c21hbHlzaGV2QGdtYWlsLmNvbT6IegQTEQgA
+IgUCT2aqtAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQL3lWvF2gS12X
+MwD9HuRIolSwIK77u8EY461y2u6sbX36n5/uo/LDQuxoi3sA/0MvpnvzOhv9Iufv
+vsZEj3E7i3h+iD5648YMwfTFCij+tCtTdGFuaXNsYXYgTWFseXNoZXYgKFBIUCBr
+ZXkpIDxzdGFzQHBocC5uZXQ+iHoEExEIACIFAk9mqaACGwMGCwkIBwMCBhUIAgkK
+CwQWAgMBAh4BAheAAAoJEC95VrxdoEtdhdsA/1qQb5RZbh6PlIVeHCFFC3fMvy56
+wJ1KC0knhphyZdcGAP9bQFhWGbxylFn7xmnbJ2bpa+0YfzRWwbgmeISoZItQ1bQ1
+U3RhbmlzbGF2IE1hbHlzaGV2IChQSFAga2V5KSA8c21hbHlzaGV2QHN1Z2FyY3Jt
+LmNvbT6IegQTEQgAIgUCT2aqnQIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQL3lWvF2gS11roQD/S/f3M7YgChaM8SAt79iAPvLieplUBgYguOJjHc16QA0A
+/Am0mjKmNq3W5P0uA/vB+liCEcMLdcZiOIsNI44eHj5PuQINBE9mqaAQCADfZPMp
+jZkkGZj3BY/7ApoLq4mwqzbh+CpLXwNn20tFNvSXfb8RdeXvVEb7Scx+W9qYpiau
+n2iXJgCVH8fgpZpR856ulT1q6uCG++CXubEvip/eJkZl93/84h04KQJwsgOrAh0O
+m3OePRn8Pr+++0LNS0EL8uX/YHeTOGOnnmTqYTeySBVFdov6L4mepddfjekicKQq
+hL7mZh/xuq29JijT0uNNX8v4vDWQDu5dlAcdd+uB3gcXMD/PginD11zp+6wtrWCm
+/+yBqpvDwXQX5PGUnwvbRfl7Ay3MmwmoXiecZMg0dwTSc7e0lhB4HGRHZdBMJB4r
+HUVGdzqujK/ctOvrAAMFB/0Utb76Qe6sCMlHxVAmeE/fbo7Pi05btZ/x01r67dHf
+aMSP0riCKJ7M0OW+jAXtu9+z/BVnYisW67WWfxl2cS5tZDgiHgJARXWUOO72+sSc
+HP8KQmTl1z16gyKbwY3SmyBkwcpOL35nhUWNLy93syPoY6sZUTikr2bZYukHDQ33
+XBPs4e6MbWKfsa9qaVmnlOF3k5UqChjutfHaEa4Q7VP4wBIpphHBi9MI16oJIzzB
+PbGl2uoedjwiZ6QeQZnSuOVYZxU2d3lRA8PrtfFN1VSlpEm/VcAvtieHUYWHN0wO
+u+cp3Slr5XJVNjTjJhl28SlinMME54mKAGf2Ldr/dRwXiGEEGBEIAAkFAk9mqaAC
+GwwACgkQL3lWvF2gS126EQD/VVd3FgjLKglClRQPzdfU847tqDK4zJjbmRv5vLLw
+oE0A+wbrQs7jVGU3NrS0AIl5vUmewpp2BKzSkepy23nWmejwmQINBFjxRtoBEADk
S6+Q7afwYDPFnqJXuyF2ZIvXysDBrpr/xbre4jVeiC/HIELaQedOJqO1V+BgnTRk
fhor+Yq3mZ1un+6zJIiFcm5Kp7sPZjh15JF96PsA4e2Eh5eCeJzjXHj1nAKXfn5+
CgpYEyL30r1/ACkmo9TKIiUxIDZRkZvxjY4UKeo+EoJo0ViutV8mvSTgxaz9gzPh
@@ -267,255 +267,54 @@ xs9nUb8qod2HMOPLOFqwxck7ueGaeDN/GZ5zjPdIppYwE3LbCM1ZFLkV+QhFef4z
Xwml1/AnGGFULgGYorwGCchizhU1wbZVcoUF74MtprnAsuPdFxlw+4yCcFEeYVpM
DQg/ZfZ28T1GruGHqLJqIVpOum48Ec+fjnHAZAH9dOs/qhBuCLE+5xUoVyP2lwt0
MaHs5SLmxRKhcV6IWRJKTlZ9YdDXbVv5LisL/qDOTjRj7vOgCPRhklyA0JjFeyTD
-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
-=bWxl
+pSeAWXFZnab0nYBPWkxtdxxRruEeQPAYP1vl0O6ABMxRAI6o6zIImQINBF629C4B
+EADl/O47tHfZap6Y3PwfI9/4we/TDwJLqBP8jMz3AH8s5e8rWHIIwXJao1NWFkd4
+VnSSiNEMeffkrNWpyCbjr06NEmmp49GCUpQwhT1DuQu8LhKoePhIGnAIstty1Lbp
+ylSfTEO7fk7SnkYoyPOCiufEXDOLpBx8Gwm/cMNZhFI05XCQSf5+9IjaExihgmdf
+CKchbyvGrUn9Y7eu5PYUtsEu1STasNzq5usSQ6hot3zBbVoPRK8a7TZCDGJqzvqH
+0bIpVHKVKxA8r9kPxTb4jlRPQV81VSe88TgsIzDSeGqOhM5NDTmVN+qr9AYPAdyF
+jemsVjMFEL34dEgM2VBsX87q2hvOkY9c9tTycCcUAEyEYREX5tdfBAFccD/8c9Dc
+K69OOB8dFovJl+qotAeXda39PFQFKCfwYa+y326Y24tM+Jr8GYfsnUa6MA6H3/oN
+CAGps0VZnBVRcjnSzNojPc9dA7OnT74ukFb0zGX6xN5dTCKRW/mLjnlOQEBW5dLK
+Nh2lj9UzG/9KUI4V4fVsEjn8IxtUMhIm7OAsUjGydk8D2CzaPUEGZwXTzDwVH2tC
+ZGocPjZ87R4xDbB27K/4nNWb4ux7mlEwis5taBnoiKiAV7R/Fq0LEJQFoiXRL7tm
+JCgMo8VDg/a3i+GvDWxr3tTHjQtU+KJ1+Tqif3QrJ53dfQARAQABtDhHYWJyaWVs
+IENhcnVzbyAoUmVsZWFzZSBNYW5hZ2VyKSA8Y2FydXNvZ2FicmllbEBwaHAubmV0
+PokCVAQTAQgAPhYhBL/d0oZCgk+BGO93kJtnpcEiKRGPBQJetvQuAhsDBQkHhM4A
+BQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEJtnpcEiKRGPd2EQAKK3pPDXSMZH
+oAwV0q1VUdMANxbE+7TE9uXFQx6VdDZxlaEWEUFuua41u8zwCh3v6F5OjDrlWwoP
+Rq/c5yWvypUB7ItB7L/uvsOqy6V8PGkH4pHxYCyFThC2OvzKFXGqNrxF70NIAz6N
+ySlQPlu5TK2PrC1MiXMMPciNdfNagSUZQKecMMij4qjRMRypcUZJTEker4CR6HC+
+4UlnBj6UpijKquaGZMAe95oRJLVwCOshLgHjihMe12qwX1njeAQqPQR4KZ7JUeaY
+4M1oymxyuZPlwUtAKSouHQ7s7g3KHaoSIalIaxY9OCxs52H5y2uyFbrqSDVWPh1/
+zgXffmu6hB/oReyDhhcH47+cTgn23cw86d7+Buppbs05g8QcjbWv099IRbVpirKm
+ORT+4qdXjev/w74WZUFXKW7PFhHor6PAUb2zAcurVv4RTIVsRD6wPovUKgkbdJeX
+9vbJrZycgnGT4twL7WSPKivn4BYBIp28/jZzl2OtiSyZf/hrnEqFp8fa4DiW9mRA
+3ExbjfCQqOGMTwLwAkj4m+AhdN55xYQLsj/6pz3AysBRoS1E/vtxSIpRAAmf3Uhh
+MpRkKk0mA5f4MsQqR7JZ2ben9k/GTHeH7qsqzb1k+rEwEY8F91QgsBzT5zO4pPQ1
+rIGTN4CBa7QcJH3fc3i9rYMYAtuVlpCUuQINBF629C4BEADdWtCy2yfnyjSBasMb
+IzTOV+WHcj0DJJDNJjGcy4GTM98gklBcP2W3w+makX6cboHpN/TNpfAUQPHlqNE4
+hQKth3Q/clwX6olnNQxS9GZFYCbUjPHMxOCF9RDjewUcIp9AZDgoZ/jxNCVinb64
+8qOm2ffeWBcjZANxpVMUsqAIWorzxX60qCgVEl0omQZPSs3a0uZO+mZYRO91Xo9U
+uVws/krKo+l+vN4g6k1pZF2lCfBAJ8L/m/Ncz5p438ZwFmMWvx4vrxlsQ4A4T+BJ
+flyUi43BAeSVrdGtVJEil4oM+y5GIm9bNPdZiJEz7DZrbIeXNqKRjKFiXcG2b8qo
+DN1aq5QiJC3Rok4ar4YfOZCpL4INQYnINHdNL5lpcyeDBYZG7dKUy2O4afnvjxd4
+FnsvYp5qm4s+dl2oPD0Gr+6KTotX2/eVr4vwZDGer+Z5o8c0BHvh2heFI2RtXxcF
+adx7LNldg709kAM8/yVdQI9GjRaN+1QFXmyqpHa8TQkUEIOKet9JMBCJkcCU2GPL
+VTVJVUD23VcJGCb3YV47FVwKT6MQYVNtEuanr8TIiP9hYRBx4JuT5qJEml4g4CCO
+xpuLFIKAK3rJbzpsnaUHhikjlOYGdTELb3wb3XEEH1dZJZwk7WEDFf+pTVFxMfS5
+V82kN/wIdCwtF0lfvAfc8/wNBQARAQABiQI8BBgBCAAmFiEEv93ShkKCT4EY73eQ
+m2elwSIpEY8FAl629C4CGwwFCQeEzgAACgkQm2elwSIpEY9frw//SgPRLx3Tzcg5
+PI1P3VLz2Cqi3EEygNHAaQ3L/fjdG31RYowbcPB6coPtt0NF8SbsKYC+ze9hy8Qi
+c66XyMrnHOY/fflq4dcK26ncp5CifYTNuJTIY9mR2j+NqDegLeLpyxRofNGvmJCR
+Y08YfYzkb7Y16UI86vo/vIrEOYu9ck/Vk83rCQYbayzFUK4DjQ+ROgEvyLlBIzh7
+dyDbhthxSadI0bXZQU/WSwfs6EySCDAEVKmRmU4Bfq3oVSLE13ne33VonTCvRijf
+UlPnAVmd73G9+5Q6YfGwpkW/2hpW8uYQVMuisK0lxf1elbMqlonHF87ffQ6tAX7k
+hPlQimIx06MsOI/YJ5a2XR9jTMMlIInCm3PBi28Rkurc2K0stjA/gSC0A/nJ6RoA
+Mg9pG3BJuoIRli004tdXKLXK9Llwi4j2cFhtvMnIcfR8V77zVDQK7w0pj9urmaqP
+1mRWLpGmhS5bUKHCOTxAJMdiuDfsW9MuR7f/DPlzTv7f6QEfsh1jVKWVIG2dHbo5
+uYT3VQPVOdXMhzArnDpdLDdPqDtuq3u3tGU5yJoxehwc4DeS4Q5nHKE+K6ThSaq1
+u+4TjIbyFJIOZ+Enet8GwfPASrD1xepkVBD3B7r8C6+YwBPEElurC4aYQG4eexl3
+RbbnRGir0GxlvcmpWMLo+2IqeVyRrbY=
+=jKsj
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/php.ini b/php.ini
index d52aeaa..ebad37a 100644
--- a/php.ini
+++ b/php.ini
@@ -1322,7 +1322,8 @@ session.cookie_domain =
session.cookie_httponly =
; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
-; Current valid values are "Lax" or "Strict"
+; Current valid values are "Strict", "Lax" or "None". When using "None",
+; make sure to include the quotes, as `none` is interpreted like `false` in ini files.
; https://tools.ietf.org/html/draft-west-first-party-cookies-07
session.cookie_samesite =
@@ -1365,8 +1366,8 @@ session.gc_maxlifetime = 1440
; (see session.save_path above), then garbage collection does *not*
; happen automatically. You will need to do your own garbage
; collection through a shell script, cron entry, or some other method.
-; For example, the following script would is the equivalent of
-; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
+; For example, the following script is the equivalent of setting
+; session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
; find /path/to/sessions -cmin +24 -type f | xargs rm
; Check HTTP Referer to invalidate externally stored URLs containing ids.
diff --git a/php.spec b/php.spec
index 45390cd..38954b2 100644
--- a/php.spec
+++ b/php.spec
@@ -56,10 +56,14 @@
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
%if 0%{?rhel} == 6
+%ifarch x86_64
+%global oraclever 18.5
+%else
%global oraclever 18.3
+%endif
%global oraclelib 18.1
%else
-%global oraclever 19.3
+%global oraclever 19.6
%global oraclelib 19.1
%endif
@@ -131,7 +135,7 @@
%global db_devel libdb-devel
%endif
-%global upver 7.3.12
+%global upver 7.3.21
%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
@@ -148,7 +152,7 @@ License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA
Group: Development/Languages
URL: http://www.php.net/
-Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
+Source0: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
Source1: php.conf
Source2: php.ini
Source3: macros.php
@@ -184,10 +188,11 @@ Patch42: php-7.3.3-systzdata-v18.patch
Patch43: php-7.3.0-phpize.patch
# Use -lldap_r for OpenLDAP
Patch45: php-7.2.3-ldap_r.patch
-# Make php_config.h constant across builds
-Patch46: php-7.2.4-fixheader.patch
+# Make php_config.h constant across builds (from 7.4)
+Patch46: php-7.3.20-fixheader.patch
# drop "Configure command" from phpinfo output
-Patch47: php-5.6.3-phpinfo.patch
+# and add build system and provider (from 8.0)
+Patch47: php-7.3.20-phpinfo.patch
# backport PDOStatement::getColumnMeta from 7.4
Patch48: php-7.3.3-pdooci.patch
@@ -710,8 +715,11 @@ Group: Development/Languages
# ucgendat is licensed under OpenLDAP
License: PHP and LGPLv2 and BSD and OpenLDAP
%if %{with_onig}
-# ensure we have soname 5
-BuildRequires: oniguruma-devel >= 6.8
+%if 0%{?rhel}
+BuildRequires: oniguruma5php-devel
+%else
+BuildRequires: oniguruma-devel
+%endif
%else
Provides: bundled(oniguruma) = 6.9.0
%endif
@@ -853,7 +861,7 @@ Group: System Environment/Libraries
# All files licensed under PHP version 3.01
License: PHP
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-# Upstream requires 4.0, we require 50 to ensure use of libicu-last / libicu62
+# Upstream requires 4.0, we require 50 to ensure use of libicu-last / libicu65
BuildRequires: libicu-devel >= 50
@@ -1112,6 +1120,11 @@ exit 1
# Set build date from https://reproducible-builds.org/specs/source-date-epoch/
export SOURCE_DATE_EPOCH=$(date +%s -r NEWS)
+export PHP_UNAME=$(uname)
+export PHP_BUILD_SYSTEM=$(cat /etc/redhat-release | sed -e 's/ Beta//')
+%if 0%{?vendor:1}
+export PHP_BUILD_PROVIDER="%{vendor}"
+%endif
# aclocal workaround - to be improved
cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4
@@ -1306,6 +1319,7 @@ popd
without_shared="--without-gd \
--disable-dom --disable-dba --without-unixODBC \
--disable-opcache \
+ --disable-phpdbg \
--disable-json \
--disable-xmlreader --disable-xmlwriter \
--without-sodium \
@@ -1899,6 +1913,68 @@ fi
%changelog
+* Tue Jul 21 2020 Remi Collet <remi@remirepo.net> - 7.3.21~RC1-1
+- update to 7.3.21RC1
+- build using ICU 65 (excepted on EL-6)
+
+* Tue Jul 7 2020 Remi Collet <remi@remirepo.net> - 7.3.20-1
+- Update to 7.3.20 - http://www.php.net/releases/7_3_20.php
+
+* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 7.3.20~RC1-2
+- display build system and provider in phpinfo (from 8.0)
+
+* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 7.3.20~RC1-1
+- update to 7.3.20RC1
+
+* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 7.3.19-1
+- Update to 7.3.19 - http://www.php.net/releases/7_3_19.php
+- rebuild using oniguruma5php
+- build phpdbg only once
+
+* Tue May 26 2020 Remi Collet <remi@remirepo.net> - 7.3.19~RC1-1
+- update to 7.3.19RC1
+
+* Tue May 12 2020 Remi Collet <remi@remirepo.net> - 7.3.18-1
+- Update to 7.3.18 - http://www.php.net/releases/7_3_18.php
+
+* Tue Apr 28 2020 Remi Collet <remi@remirepo.net> - 7.3.18~RC1-1
+- update to 7.3.18RC1
+
+* Tue Apr 14 2020 Remi Collet <remi@remirepo.net> - 7.3.17-1
+- Update to 7.3.17 - http://www.php.net/releases/7_3_17.php
+
+* Tue Mar 31 2020 Remi Collet <remi@remirepo.net> - 7.3.17~RC1-1
+- update to 7.3.17RC1
+
+* Tue Mar 17 2020 Remi Collet <remi@remirepo.net> - 7.3.16-1
+- Update to 7.3.16 - http://www.php.net/releases/7_3_16.php
+- use oracle client library version 19.6 (18.5 on EL-6)
+
+* Tue Mar 3 2020 Remi Collet <remi@remirepo.net> - 7.3.16~RC1-1
+- update to 7.3.16RC1
+
+* Tue Feb 18 2020 Remi Collet <remi@remirepo.net> - 7.3.15-1
+- Update to 7.3.15 - http://www.php.net/releases/7_3_15.php
+
+* Tue Feb 4 2020 Remi Collet <remi@remirepo.net> - 7.3.15~RC1-1
+- update to 7.3.15RC1
+
+* Tue Jan 21 2020 Remi Collet <remi@remirepo.net> - 7.3.14-1
+- Update to 7.3.14 - http://www.php.net/releases/7_3_14.php
+
+* Tue Jan 7 2020 Remi Collet <remi@remirepo.net> - 7.3.14~RC1-1
+- update to 7.3.14RC1
+
+* Tue Dec 17 2019 Remi Collet <remi@remirepo.net> - 7.3.13-1
+- Update to 7.3.13 - http://www.php.net/releases/7_3_13.php
+- use oracle client library version 19.5 (18.5 on EL-6)
+
+* Tue Dec 3 2019 Remi Collet <remi@remirepo.net> - 7.3.13~RC1-1
+- update to 7.3.13RC1
+
+* Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 7.3.12-1
+- Update to 7.3.12 - http://www.php.net/releases/7_3_12.php
+
* Wed Nov 6 2019 Remi Collet <remi@remirepo.net> - 7.3.12~RC1-1
- update to 7.3.12RC1