update to 8.1.0RC5 - https://fedoraproject.org/wiki/Changes/php81

bump API version
2021-10-28 09:51:21 +02:00 · 2021-10-28 09:51:21 +02:00 · 627a253868
commit 627a253868
parent f176e21d38
15 changed files with 331 additions and 6305 deletions
--- a/.gitignore
+++ b/.gitignore
@ -38,3 +38,5 @@ php-7.*.xz.asc
 /php-8.0.12RC1.tar.xz.asc
 /php-8.0.12.tar.xz
 /php-8.0.12.tar.xz.asc
+/php-8.1.0RC5.tar.xz
+/php-8.1.0RC5.tar.xz.asc
--- a/10-opcache.ini
+++ b/10-opcache.ini
@ -42,6 +42,11 @@ opcache.enable_cli=1
 ; size of the optimized code.
 ;opcache.save_comments=1

+; If enabled, compilation warnings (including notices and deprecations) will
+; be recorded and replayed each time a file is included. Otherwise, compilation
+; warnings will only be emitted when the file is first cached.
+;opcache.record_warnings=0
+
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0

@ -131,12 +136,12 @@ opcache.huge_code_pages=0

 ; Specifies a PHP script that is going to be compiled and executed at server
 ; start-up.
-; http://php.net/opcache.preload
+; https://php.net/opcache.preload
 ;opcache.preload=

 ; Preloading code as root is not allowed for security reasons. This directive
 ; facilitates to let the preloading to be run as another user.
-; http://php.net/opcache.preload_user
+; https://php.net/opcache.preload_user
 ;opcache.preload_user=

 ; Prevents caching files that are less than this number of seconds old. It
--- a/php-8.0.0-phpinfo.patch
+++ b/php-8.0.0-phpinfo.patch
@ -1,118 +0,0 @@
-
-Drop "Configure Command" from phpinfo as it doesn't
-provide any useful information.
-The available extensions are not related to this command.
-
-Replace full GCC name by gcc in php -v output
-
-
-Also apply
-
-From 9bf43c45908433d382f0499d529849172d0d8206 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 28 Dec 2020 08:33:09 +0100
-Subject: [PATCH] rename COMPILER and ARCHITECTURE macro (too generic)
-
---
- configure.ac             |  4 ++--
- ext/standard/info.c      |  8 ++++----
- sapi/cli/php_cli.c       |  8 ++++----
- win32/build/confutils.js | 10 +++++-----
- 4 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9d9c8b155b07..143dc061346b 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -1289,10 +1289,10 @@ if test -n "${PHP_BUILD_PROVIDER}"; then
-   AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider])
- fi
- if test -n "${PHP_BUILD_COMPILER}"; then
-  AC_DEFINE_UNQUOTED(COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
-+  AC_DEFINE_UNQUOTED(PHP_BUILD_COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
- fi
- if test -n "${PHP_BUILD_ARCH}"; then
-  AC_DEFINE_UNQUOTED(ARCHITECTURE,"$PHP_BUILD_ARCH",[build architecture])
-+  AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
- fi
- 
- PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
-diff --git a/ext/standard/info.c b/ext/standard/info.c
-index 153cb6cde014..8ceef31d9fe4 100644
--- a/ext/standard/info.c
-+++ b/ext/standard/info.c
-@@ -798,11 +798,11 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
- #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);
-+#ifdef PHP_BUILD_COMPILER
-+		php_info_print_table_row(2, "Compiler", PHP_BUILD_COMPILER);
- #endif
-#ifdef ARCHITECTURE
-		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
-+#ifdef PHP_BUILD_ARCH
-+		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
- #endif
- #ifdef CONFIGURE_COMMAND
- 		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
-diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
-index 5092fb0ffd68..9d296acec631 100644
--- a/sapi/cli/php_cli.c
-+++ b/sapi/cli/php_cli.c
-@@ -640,12 +640,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
- #else
- 					"NTS "
- #endif
-#ifdef COMPILER
-					COMPILER
-+#ifdef PHP_BUILD_COMPILER
-+					PHP_BUILD_COMPILER
- 					" "
- #endif
-#ifdef ARCHITECTURE
-					ARCHITECTURE
-+#ifdef PHP_BUILD_ARCH
-+					PHP_BUILD_ARCH
- 					" "
- #endif
- #if ZEND_DEBUG
-
-diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
--- ./ext/standard/info.c.phpinfo	2020-07-21 10:49:31.000000000 +0200
-+++ ./ext/standard/info.c	2020-07-21 11:41:56.295633523 +0200
-@@ -804,9 +804,6 @@ PHPAPI ZEND_COLD void php_print_info(int
- #ifdef PHP_BUILD_ARCH
- 		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
- #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 ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2020-07-21 10:49:31.000000000 +0200
-+++ ./ext/standard/tests/general_functions/phpinfo.phpt	2020-07-21 11:41:56.296633522 +0200
-@@ -17,7 +17,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 -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
--- ./sapi/cli/php_cli.c.phpinfo	2020-07-21 11:43:38.812475300 +0200
-+++ ./sapi/cli/php_cli.c	2020-07-21 11:43:45.783464540 +0200
-@@ -641,8 +641,7 @@ static int do_cli(int argc, char **argv)
- 					"NTS "
- #endif
- #ifdef PHP_BUILD_COMPILER
-					PHP_BUILD_COMPILER
-					" "
-+					"gcc "
- #endif
- #ifdef PHP_BUILD_ARCH
- 					PHP_BUILD_ARCH
--- a/php-8.0.10-openssl3.patch
+++ b/php-8.0.10-openssl3.patch
--- a/php-8.0.10-phar-sha.patch
+++ b/php-8.0.10-phar-sha.patch
@ -1,515 +0,0 @@
-Backported for 8.0 from
-
-
-From 8bb0c74e24359a11216824117ac3adf3d5ef7b71 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 5 Aug 2021 11:10:15 +0200
-Subject: [PATCH] switch phar to use sha256 signature by default
-
---
- ext/phar/phar/pharcommand.inc                  | 2 +-
- ext/phar/tests/create_new_and_modify.phpt      | 4 ++--
- ext/phar/tests/create_new_phar_c.phpt          | 4 ++--
- ext/phar/tests/phar_setsignaturealgo2.phpt     | 2 +-
- ext/phar/tests/tar/phar_setsignaturealgo2.phpt | 2 +-
- ext/phar/tests/zip/phar_setsignaturealgo2.phpt | 2 +-
- ext/phar/util.c                                | 6 +++---
- ext/phar/zip.c                                 | 2 +-
- 8 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
-index a31290eee75fe..5f698b4bec26b 100644
--- a/ext/phar/phar/pharcommand.inc
-+++ b/ext/phar/phar/pharcommand.inc
-@@ -92,7 +92,7 @@ class PharCommand extends CLICommand
-                 'typ' => 'select',
-                 'val' => NULL,
-                 'inf' => '<method> Selects the hash algorithm.',
-                'select' => array('md5' => 'MD5','sha1' => 'SHA1')
-+                'select' => array('md5' => 'MD5','sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512', 'openssl' => 'OPENSSL')
-             ),
-             'i' => array(
-                 'typ' => 'regex',
-diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt
-index 02e36c6cea2fe..32defcae8a639 100644
--- a/ext/phar/tests/create_new_and_modify.phpt
-+++ b/ext/phar/tests/create_new_and_modify.phpt
-@@ -49,8 +49,8 @@ include $pname . '/b.php';
- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
- --EXPECTF--
- brand new!
-string(40) "%s"
-string(40) "%s"
-+string(%d) "%s"
-+string(%d) "%s"
- bool(true)
- modified!
- another!
-diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt
-index 566d3c4d5f8ad..bf6d740fd1d10 100644
--- a/ext/phar/tests/create_new_phar_c.phpt
-+++ b/ext/phar/tests/create_new_phar_c.phpt
-@@ -20,7 +20,7 @@ var_dump($phar->getSignature());
- --EXPECTF--
- array(2) {
-   ["hash"]=>
-  string(40) "%s"
-+  string(64) "%s"
-   ["hash_type"]=>
-  string(5) "SHA-1"
-+  string(7) "SHA-256"
- }
-diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt
-index 293d3196713d8..4f31836fbbbcc 100644
--- a/ext/phar/tests/phar_setsignaturealgo2.phpt
-+++ b/ext/phar/tests/phar_setsignaturealgo2.phpt
-@@ -52,7 +52,7 @@ array(2) {
-   ["hash"]=>
-   string(%d) "%s"
-   ["hash_type"]=>
-  string(5) "SHA-1"
-+  string(7) "SHA-256"
- }
- array(2) {
-   ["hash"]=>
-diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
-index 9923ac5c88476..cc10a241d739b 100644
--- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
-+++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
-@@ -51,7 +51,7 @@ array(2) {
-   ["hash"]=>
-   string(%d) "%s"
-   ["hash_type"]=>
-  string(5) "SHA-1"
-+  string(7) "SHA-256"
- }
- array(2) {
-   ["hash"]=>
-diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
-index 8de77479d7825..60fec578ee894 100644
--- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
-+++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
-@@ -78,7 +78,7 @@ array(2) {
-   ["hash"]=>
-   string(%d) "%s"
-   ["hash_type"]=>
-  string(5) "SHA-1"
-+  string(7) "SHA-256"
- }
- array(2) {
-   ["hash"]=>
-diff --git a/ext/phar/util.c b/ext/phar/util.c
-index 314acfe81a788..8d2db03b69601 100644
--- a/ext/phar/util.c
-+++ b/ext/phar/util.c
-@@ -1798,6 +1798,8 @@ int phar_create_signature(phar_archive_d
- 			*signature_length = 64;
- 			break;
- 		}
-+		default:
-+			phar->sig_flags = PHAR_SIG_SHA256;
- 		case PHAR_SIG_SHA256: {
- 			unsigned char digest[32];
- 			PHP_SHA256_CTX  context;
-@@ -1894,8 +1896,6 @@ int phar_create_signature(phar_archive_d
- 			*signature_length = siglen;
- 		}
- 		break;
-		default:
-			phar->sig_flags = PHAR_SIG_SHA1;
- 		case PHAR_SIG_SHA1: {
- 			unsigned char digest[20];
- 			PHP_SHA1_CTX  context;
-diff --git a/ext/phar/zip.c b/ext/phar/zip.c
-index 31d4bd2998215..c5e38cabf7b87 100644
--- a/ext/phar/zip.c
-+++ b/ext/phar/zip.c
-@@ -1423,7 +1423,7 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, zend_long len, int
- 
- 	memcpy(eocd.signature, "PK\5\6", 4);
- 	if (!phar->is_data && !phar->sig_flags) {
-		phar->sig_flags = PHAR_SIG_SHA1;
-+		phar->sig_flags = PHAR_SIG_SHA256;
- 	}
- 	if (phar->sig_flags) {
- 		PHAR_SET_16(eocd.counthere, zend_hash_num_elements(&phar->manifest) + 1);
-
-From c51af22fef988c1b2f92b7b9e3a9d745f7084815 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 5 Aug 2021 16:49:48 +0200
-Subject: [PATCH] implement openssl_256 and openssl_512 for phar singatures
-
---
- ext/openssl/openssl.c                         |   1 +
- ext/phar/phar.1.in                            |  10 +++-
- ext/phar/phar.c                               |   8 +++-
- ext/phar/phar/pharcommand.inc                 |  14 +++++-
- ext/phar/phar_internal.h                      |   2 +
- ext/phar/phar_object.c                        |  24 ++++++++--
- ext/phar/tests/files/openssl256.phar          | Bin 0 -> 7129 bytes
- ext/phar/tests/files/openssl256.phar.pubkey   |   6 +++
- ext/phar/tests/files/openssl512.phar          | Bin 0 -> 7129 bytes
- ext/phar/tests/files/openssl512.phar.pubkey   |   6 +++
- .../phar_get_supported_signatures_002a.phpt   |   6 ++-
- .../tests/tar/phar_setsignaturealgo2.phpt     |  16 +++++++
- ext/phar/tests/test_signaturealgos.phpt       |   8 ++++
- ext/phar/util.c                               |  45 ++++++++++++++----
- 14 files changed, 128 insertions(+), 18 deletions(-)
- create mode 100644 ext/phar/tests/files/openssl256.phar
- create mode 100644 ext/phar/tests/files/openssl256.phar.pubkey
- create mode 100644 ext/phar/tests/files/openssl512.phar
- create mode 100644 ext/phar/tests/files/openssl512.phar.pubkey
-
-diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in
-index 77912b241dfd5..323e77b0e2a3b 100644
--- a/ext/phar/phar.1.in
-+++ b/ext/phar/phar.1.in
-@@ -475,7 +475,15 @@ SHA512
- .TP
- .PD
- .B openssl
-OpenSSL
-+OpenSSL using SHA-1
-+.TP
-+.PD
-+.B openssl_sha256
-+OpenSSL using SHA-256
-+.TP
-+.PD
-+.B openssl_sha512
-+OpenSSL using SHA-512
- 
- .SH SEE ALSO
- For a more or less complete description of PHAR look here:
-diff --git a/ext/phar/phar.c b/ext/phar/phar.c
-index 77f21cef9da53..bc08e4edde05d 100644
--- a/ext/phar/phar.c
-+++ b/ext/phar/phar.c
-@@ -869,6 +869,8 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, size_t fname_len, ch
- 		PHAR_GET_32(sig_ptr, sig_flags);
- 
- 		switch(sig_flags) {
-+			case PHAR_SIG_OPENSSL_SHA512:
-+			case PHAR_SIG_OPENSSL_SHA256:
- 			case PHAR_SIG_OPENSSL: {
- 				uint32_t signature_len;
- 				char *sig;
-@@ -903,7 +905,7 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, size_t fname_len, ch
- 					return FAILURE;
- 				}
- 
-				if (FAILURE == phar_verify_signature(fp, end_of_phar, PHAR_SIG_OPENSSL, sig, signature_len, fname, &signature, &sig_len, error)) {
-+				if (FAILURE == phar_verify_signature(fp, end_of_phar, sig_flags, sig, signature_len, fname, &signature, &sig_len, error)) {
- 					efree(savebuf);
- 					efree(sig);
- 					php_stream_close(fp);
-@@ -3162,7 +3164,9 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
- 
- 				php_stream_write(newfile, digest, digest_len);
- 				efree(digest);
-				if (phar->sig_flags == PHAR_SIG_OPENSSL) {
-+				if (phar->sig_flags == PHAR_SIG_OPENSSL ||
-+					phar->sig_flags == PHAR_SIG_OPENSSL_SHA256 ||
-+					phar->sig_flags == PHAR_SIG_OPENSSL_SHA512) {
- 					phar_set_32(sig_buf, digest_len);
- 					php_stream_write(newfile, sig_buf, 4);
- 				}
-diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
-index 5f698b4bec26b..1b1eeca59c560 100644
--- a/ext/phar/phar/pharcommand.inc
-+++ b/ext/phar/phar/pharcommand.inc
-@@ -92,7 +92,7 @@ class PharCommand extends CLICommand
-                 'typ' => 'select',
-                 'val' => NULL,
-                 'inf' => '<method> Selects the hash algorithm.',
-                'select' => array('md5' => 'MD5','sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512', 'openssl' => 'OPENSSL')
-+                'select' => ['md5' => 'MD5','sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512', 'openssl' => 'OPENSSL', 'openssl_sha256' => 'OPENSSL_SHA256', 'openssl_sha512' => 'OPENSSL_SHA512']
-             ),
-             'i' => array(
-                 'typ' => 'regex',
-@@ -156,6 +156,8 @@ class PharCommand extends CLICommand
-         $hash_avail = Phar::getSupportedSignatures();
-         $hash_optional = array('SHA-256' => 'SHA256',
-                                'SHA-512' => 'SHA512',
-+                               'OpenSSL_sha256' => 'OpenSSL_SHA256',
-+                               'OpenSSL_sha512' => 'OpenSSL_SHA512',
-                                'OpenSSL' => 'OpenSSL');
-         if (!in_array('OpenSSL', $hash_avail)) {
-             unset($phar_args['y']);
-@@ -429,6 +431,16 @@ class PharCommand extends CLICommand
-                     self::error("Cannot use OpenSSL signing without key.\n");
-                 }
-                 return Phar::OPENSSL;
-+            case 'openssl_sha256':
-+                if (!$privkey) {
-+                    self::error("Cannot use OpenSSL signing without key.\n");
-+                }
-+                return Phar::OPENSSL_SHA256;
-+            case 'openssl_sha512':
-+                if (!$privkey) {
-+                    self::error("Cannot use OpenSSL signing without key.\n");
-+                }
-+                return Phar::OPENSSL_SHA512;
-         }
-     }
-     // }}}
-diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
-index a9f81e2ab994a..30b408a8c4462 100644
--- a/ext/phar/phar_internal.h
-+++ b/ext/phar/phar_internal.h
-@@ -88,6 +88,8 @@
- #define PHAR_SIG_SHA256           0x0003
- #define PHAR_SIG_SHA512           0x0004
- #define PHAR_SIG_OPENSSL          0x0010
-+#define PHAR_SIG_OPENSSL_SHA256   0x0011
-+#define PHAR_SIG_OPENSSL_SHA512   0x0012
- 
- /* flags byte for each file adheres to these bitmasks.
-    All unused values are reserved */
-diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
-index 9c1e5f2fa1eef..c05970e657f18 100644
--- a/ext/phar/phar_object.c
-+++ b/ext/phar/phar_object.c
-@@ -1246,9 +1246,13 @@ PHP_METHOD(Phar, getSupportedSignatures)
- 	add_next_index_stringl(return_value, "SHA-512", 7);
- #ifdef PHAR_HAVE_OPENSSL
- 	add_next_index_stringl(return_value, "OpenSSL", 7);
-+	add_next_index_stringl(return_value, "OpenSSL_SHA256", 14);
-+	add_next_index_stringl(return_value, "OpenSSL_SHA512", 14);
- #else
- 	if (zend_hash_str_exists(&module_registry, "openssl", sizeof("openssl")-1)) {
- 		add_next_index_stringl(return_value, "OpenSSL", 7);
-+		add_next_index_stringl(return_value, "OpenSSL_SHA256", 14);
-+		add_next_index_stringl(return_value, "OpenSSL_SHA512", 14);
- 	}
- #endif
- }
-@@ -3028,6 +3032,8 @@ PHP_METHOD(Phar, setSignatureAlgorithm)
- 		case PHAR_SIG_MD5:
- 		case PHAR_SIG_SHA1:
- 		case PHAR_SIG_OPENSSL:
-+		case PHAR_SIG_OPENSSL_SHA256:
-+		case PHAR_SIG_OPENSSL_SHA512:
- 			if (phar_obj->archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->archive))) {
- 				zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname);
- 				RETURN_THROWS();
-@@ -3066,19 +3072,25 @@ PHP_METHOD(Phar, getSignature)
- 		add_assoc_stringl(return_value, "hash", phar_obj->archive->signature, phar_obj->archive->sig_len);
- 		switch(phar_obj->archive->sig_flags) {
- 			case PHAR_SIG_MD5:
-				add_assoc_stringl(return_value, "hash_type", "MD5", 3);
-+				add_assoc_string(return_value, "hash_type", "MD5");
- 				break;
- 			case PHAR_SIG_SHA1:
-				add_assoc_stringl(return_value, "hash_type", "SHA-1", 5);
-+				add_assoc_string(return_value, "hash_type", "SHA-1");
- 				break;
- 			case PHAR_SIG_SHA256:
-				add_assoc_stringl(return_value, "hash_type", "SHA-256", 7);
-+				add_assoc_string(return_value, "hash_type", "SHA-256");
- 				break;
- 			case PHAR_SIG_SHA512:
-				add_assoc_stringl(return_value, "hash_type", "SHA-512", 7);
-+				add_assoc_string(return_value, "hash_type", "SHA-512");
- 				break;
- 			case PHAR_SIG_OPENSSL:
-				add_assoc_stringl(return_value, "hash_type", "OpenSSL", 7);
-+				add_assoc_string(return_value, "hash_type", "OpenSSL");
-+				break;
-+			case PHAR_SIG_OPENSSL_SHA256:
-+				add_assoc_string(return_value, "hash_type", "OpenSSL_SHA256");
-+				break;
-+			case PHAR_SIG_OPENSSL_SHA512:
-+				add_assoc_string(return_value, "hash_type", "OpenSSL_SHA512");
- 				break;
- 			default:
- 				unknown = strpprintf(0, "Unknown (%u)", phar_obj->archive->sig_flags);
-@@ -5103,6 +5115,8 @@ void phar_object_init(void) /* {{{ */
- 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "PHPS", PHAR_MIME_PHPS)
- 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "MD5", PHAR_SIG_MD5)
- 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL", PHAR_SIG_OPENSSL)
-+	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL_SHA256", PHAR_SIG_OPENSSL_SHA256)
-+	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL_SHA512", PHAR_SIG_OPENSSL_SHA512)
- 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "SHA1", PHAR_SIG_SHA1)
- 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "SHA256", PHAR_SIG_SHA256)
- 	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "SHA512", PHAR_SIG_SHA512)
-diff --git a/ext/phar/tests/phar_get_supported_signatures_002a.phpt b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
-index 06d811f2c35c2..639143b3d2c90 100644
--- a/ext/phar/tests/phar_get_supported_signatures_002a.phpt
-+++ b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
-@@ -14,7 +14,7 @@ phar.readonly=0
- var_dump(Phar::getSupportedSignatures());
- ?>
- --EXPECT--
-array(5) {
-+array(7) {
-   [0]=>
-   string(3) "MD5"
-   [1]=>
-@@ -25,4 +25,8 @@ array(5) {
-   string(7) "SHA-512"
-   [4]=>
-   string(7) "OpenSSL"
-+  [5]=>
-+  string(14) "OpenSSL_SHA256"
-+  [6]=>
-+  string(14) "OpenSSL_SHA512"
- }
-diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
-index cc10a241d739b..c2eb5d77a5bf0 100644
--- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
-+++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
-@@ -38,6 +38,10 @@ $pkey = '';
- openssl_pkey_export($private, $pkey, NULL, $config_arg);
- $p->setSignatureAlgorithm(Phar::OPENSSL, $pkey);
- var_dump($p->getSignature());
-+$p->setSignatureAlgorithm(Phar::OPENSSL_SHA512, $pkey);
-+var_dump($p->getSignature());
-+$p->setSignatureAlgorithm(Phar::OPENSSL_SHA256, $pkey);
-+var_dump($p->getSignature());
- } catch (Exception $e) {
- echo $e->getMessage();
- }
-@@ -83,3 +87,15 @@ array(2) {
-   ["hash_type"]=>
-   string(7) "OpenSSL"
- }
-+array(2) {
-+  ["hash"]=>
-+  string(%d) "%s"
-+  ["hash_type"]=>
-+  string(14) "OpenSSL_SHA512"
-+}
-+array(2) {
-+  ["hash"]=>
-+  string(%d) "%s"
-+  ["hash_type"]=>
-+  string(14) "OpenSSL_SHA256"
-+}
-diff --git a/ext/phar/util.c b/ext/phar/util.c
-index 8d2db03b69601..515830bf2c70a 100644
--- a/ext/phar/util.c
-+++ b/ext/phar/util.c
-@@ -34,7 +34,7 @@
- #include <openssl/ssl.h>
- #include <openssl/pkcs12.h>
- #else
-static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len);
-+static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, php_uint32 sig_type);
- #endif
- 
- /* for links to relative location, prepend cwd of the entry */
-@@ -1381,11 +1381,11 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature)
- /* }}} */
- 
- #ifndef PHAR_HAVE_OPENSSL
-static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len) /* {{{ */
-+static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, php_uint32 sig_type) /* {{{ */
- {
- 	zend_fcall_info fci;
- 	zend_fcall_info_cache fcc;
-	zval retval, zp[3], openssl;
-+	zval retval, zp[4], openssl;
- 	zend_string *str;
- 
- 	ZVAL_STRINGL(&openssl, is_sign ? "openssl_sign" : "openssl_verify", is_sign ? sizeof("openssl_sign")-1 : sizeof("openssl_verify")-1);
-@@ -1402,6 +1402,14 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
- 	} else {
- 		ZVAL_EMPTY_STRING(&zp[0]);
- 	}
-+	if (sig_type == PHAR_SIG_OPENSSL_SHA512) {
-+		ZVAL_LONG(&zp[3], 9); /* value from openssl.c #define OPENSSL_ALGO_SHA512 9 */
-+	} else if (sig_type == PHAR_SIG_OPENSSL_SHA256) {
-+		ZVAL_LONG(&zp[3], 7); /* value from openssl.c #define OPENSSL_ALGO_SHA256 7 */
-+	} else {
-+		/* don't rely on default value which may change in the future */
-+		ZVAL_LONG(&zp[3], 1); /* value from openssl.c #define OPENSSL_ALGO_SHA1   1 */
-+	}
- 
- 	if ((size_t)end != Z_STRLEN(zp[0])) {
- 		zval_ptr_dtor_str(&zp[0]);
-@@ -1419,7 +1427,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
- 		return FAILURE;
- 	}
- 
-	fci.param_count = 3;
-+	fci.param_count = 4;
- 	fci.params = zp;
- 	Z_ADDREF(zp[0]);
- 	if (is_sign) {
-@@ -1482,12 +1490,22 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type,
- 	php_stream_rewind(fp);
- 
- 	switch (sig_type) {
-+		case PHAR_SIG_OPENSSL_SHA512:
-+		case PHAR_SIG_OPENSSL_SHA256:
- 		case PHAR_SIG_OPENSSL: {
- #ifdef PHAR_HAVE_OPENSSL
- 			BIO *in;
- 			EVP_PKEY *key;
-			EVP_MD *mdtype = (EVP_MD *) EVP_sha1();
-+			const EVP_MD *mdtype;
- 			EVP_MD_CTX *md_ctx;
-+
-+			if (sig_type == PHAR_SIG_OPENSSL_SHA512) {
-+				mdtype = EVP_sha512();
-+			} else if (sig_type == PHAR_SIG_OPENSSL_SHA256) {
-+				mdtype = EVP_sha256();
-+			} else {
-+				mdtype = EVP_sha1();
-+			}
- #else
- 			size_t tempsig;
- #endif
-@@ -1521,7 +1539,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type,
- #ifndef PHAR_HAVE_OPENSSL
- 			tempsig = sig_len;
- 
-			if (FAILURE == phar_call_openssl_signverify(0, fp, end_of_phar, pubkey ? ZSTR_VAL(pubkey) : NULL, pubkey ? ZSTR_LEN(pubkey) : 0, &sig, &tempsig)) {
-+			if (FAILURE == phar_call_openssl_signverify(0, fp, end_of_phar, pubkey ? ZSTR_VAL(pubkey) : NULL, pubkey ? ZSTR_LEN(pubkey) : 0, &sig, &tempsig, sig_type)) {
- 				if (pubkey) {
- 					zend_string_release_ex(pubkey, 0);
- 				}
-@@ -1815,6 +1833,8 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
- 			*signature_length = 32;
- 			break;
- 		}
-+		case PHAR_SIG_OPENSSL_SHA512:
-+		case PHAR_SIG_OPENSSL_SHA256:
- 		case PHAR_SIG_OPENSSL: {
- 			unsigned char *sigbuf;
- #ifdef PHAR_HAVE_OPENSSL
-@@ -1822,6 +1842,15 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
- 			BIO *in;
- 			EVP_PKEY *key;
- 			EVP_MD_CTX *md_ctx;
-+			const EVP_MD *mdtype;
-+
-+			if (phar->sig_flags == PHAR_SIG_OPENSSL_SHA512) {
-+				mdtype = EVP_sha512();
-+			} else if (phar->sig_flags == PHAR_SIG_OPENSSL_SHA256) {
-+				mdtype = EVP_sha256();
-+			} else {
-+				mdtype = EVP_sha1();
-+			}
- 
- 			in = BIO_new_mem_buf(PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len));
- 
-@@ -1847,7 +1876,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
- 			siglen = EVP_PKEY_size(key);
- 			sigbuf = emalloc(siglen + 1);
- 
-			if (!EVP_SignInit(md_ctx, EVP_sha1())) {
-+			if (!EVP_SignInit(md_ctx, mdtype)) {
- 				EVP_PKEY_free(key);
- 				efree(sigbuf);
- 				if (error) {
-@@ -1885,7 +1914,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
- 			siglen = 0;
- 			php_stream_seek(fp, 0, SEEK_END);
- 
-			if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen)) {
-+			if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen, phar->sig_flags)) {
- 				if (error) {
- 					spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname);
- 				}
--- a/php-8.0.10-snmp-sha.patch
+++ b/php-8.0.10-snmp-sha.patch
@ -1,143 +0,0 @@
-Backported for 8.0 from
-
-
-From 718e91343fddb8817a004f96f111c424843bf746 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Wed, 11 Aug 2021 13:02:18 +0200
-Subject: [PATCH] add SHA256 and SHA512 for security protocol
-
---
- ext/snmp/config.m4                            | 18 +++++++++-
- ext/snmp/snmp.c                               | 33 ++++++++++++++++++-
- .../tests/snmp-object-setSecurity_error.phpt  |  2 +-
- ext/snmp/tests/snmp3-error.phpt               |  2 +-
- 4 files changed, 51 insertions(+), 4 deletions(-)
-
-diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
-index 1475ddfe2b7f0..f285a572de9cb 100644
--- a/ext/snmp/config.m4
-+++ b/ext/snmp/config.m4
-@@ -30,7 +30,7 @@ if test "$PHP_SNMP" != "no"; then
-         AC_MSG_ERROR([Could not find the required paths. Please check your net-snmp installation.])
-       fi
-     else
-      AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).])
-+      AC_MSG_ERROR([Net-SNMP version 5.3 or greater required (detected $snmp_full_version).])
-     fi
-   else
-     AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.])
-@@ -54,6 +54,22 @@ if test "$PHP_SNMP" != "no"; then
-     $SNMP_SHARED_LIBADD
-   ])
- 
-+  dnl Check whether usmHMAC192SHA256AuthProtocol exists.
-+  PHP_CHECK_LIBRARY($SNMP_LIBNAME, usmHMAC192SHA256AuthProtocol,
-+  [
-+    AC_DEFINE(HAVE_SNMP_SHA256, 1, [ ])
-+  ], [], [
-+    $SNMP_SHARED_LIBADD
-+  ])
-+
-+  dnl Check whether usmHMAC384SHA512AuthProtocol exists.
-+  PHP_CHECK_LIBRARY($SNMP_LIBNAME, usmHMAC384SHA512AuthProtocol,
-+  [
-+    AC_DEFINE(HAVE_SNMP_SHA512, 1, [ ])
-+  ], [], [
-+    $SNMP_SHARED_LIBADD
-+  ])
-+
-   PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared)
-   PHP_SUBST(SNMP_SHARED_LIBADD)
- fi
-diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
-index 69d6549405b17..f0917501751f5 100644
--- a/ext/snmp/snmp.c
-+++ b/ext/snmp/snmp.c
-@@ -29,6 +29,7 @@
- #include "php_snmp.h"
- 
- #include "zend_exceptions.h"
-+#include "zend_smart_string.h"
- #include "ext/spl/spl_exceptions.h"
- #include "snmp_arginfo.h"
- 
-@@ -938,16 +939,48 @@ static int netsnmp_session_set_auth_prot
- 	if (!strcasecmp(prot, "MD5")) {
- 		s->securityAuthProto = usmHMACMD5AuthProtocol;
- 		s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN;
-	} else
-+		return true;
-+	}
- #endif
-+
- 	if (!strcasecmp(prot, "SHA")) {
- 		s->securityAuthProto = usmHMACSHA1AuthProtocol;
- 		s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
-	} else {
-		zend_value_error("Authentication protocol must be either \"MD5\" or \"SHA\"");
-		return (-1);
-+		return true;
- 	}
-	return (0);
-+
-+#ifdef HAVE_SNMP_SHA256
-+	if (!strcasecmp(prot, "SHA256")) {
-+		s->securityAuthProto = usmHMAC192SHA256AuthProtocol;
-+		s->securityAuthProtoLen = sizeof(usmHMAC192SHA256AuthProtocol) / sizeof(oid);
-+		return true;
-+	}
-+#endif
-+
-+#ifdef HAVE_SNMP_SHA512
-+	if (!strcasecmp(prot, "SHA512")) {
-+		s->securityAuthProto = usmHMAC384SHA512AuthProtocol;
-+		s->securityAuthProtoLen = sizeof(usmHMAC384SHA512AuthProtocol) / sizeof(oid);
-+		return true;
-+	}
-+#endif
-+
-+	smart_string err = {0};
-+
-+	smart_string_appends(&err, "Authentication protocol must be \"SHA\"");
-+#ifdef HAVE_SNMP_SHA256
-+	smart_string_appends(&err, " or \"SHA256\"");
-+#endif
-+#ifdef HAVE_SNMP_SHA512
-+	smart_string_appends(&err, " or \"SHA512\"");
-+#endif
-+#ifndef DISABLE_MD5
-+	smart_string_appends(&err, " or \"MD5\"");
-+#endif
-+	smart_string_0(&err);
-+	zend_value_error("%s", err.c);
-+	smart_string_free(&err);
-+	return false;
- }
- /* }}} */
- 
-diff --git a/ext/snmp/tests/snmp-object-setSecurity_error.phpt b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
-index f8de846492a75..cf4f928837773 100644
--- a/ext/snmp/tests/snmp-object-setSecurity_error.phpt
-+++ b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
-@@ -59,7 +59,7 @@ var_dump($session->close());
- --EXPECTF--
- Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv"
- Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv"
-Authentication protocol must be either "MD5" or "SHA"
-+Authentication protocol must be %s
- 
- Warning: SNMP::setSecurity(): Error generating a key for authentication pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d
- bool(false)
-diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt
-index 849e363b45058..389800dad6b28 100644
--- a/ext/snmp/tests/snmp3-error.phpt
-+++ b/ext/snmp/tests/snmp3-error.phpt
-@@ -58,7 +58,7 @@ try {
- Checking error handling
- Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv"
- Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv"
-Authentication protocol must be either "MD5" or "SHA"
-+Authentication protocol must be %s
- 
- Warning: snmp3_get(): Error generating a key for authentication pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d
- bool(false)
--- a/php-8.0.12-crypt.patch
+++ b/php-8.0.12-crypt.patch
@ -1,66 +0,0 @@
-From 9f98bc58c7bb7fdbb25614ca645bbd7a465fdfed Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 15 Oct 2021 15:45:50 +0200
-Subject: [PATCH] remove closing bracket in bad place
-
---
- build/php.m4 | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/build/php.m4 b/build/php.m4
-index 9746ba28f325..7fb9e3125d13 100644
--- a/build/php.m4
-+++ b/build/php.m4
-@@ -2219,7 +2219,6 @@ struct crypt_data buffer;
- crypt_r("passwd", "hash", &buffer);
- ]])],[php_cv_crypt_r_style=struct_crypt_data_gnu_source],[])
-     fi
-    ])
- 
-     if test "$php_cv_crypt_r_style" = "none"; then
-       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-From fc4e31467c352032ee709ac55d3c67bc22abcd8d Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 15 Oct 2021 17:11:12 +0200
-Subject: [PATCH] add --with-external-libcrypt build option display an error
- message if some algo not available in external libcrypt
-
---
- ext/standard/config.m4 | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
-index 58b9c5e658a4..3ec18be4d7df 100644
--- a/ext/standard/config.m4
-+++ b/ext/standard/config.m4
-@@ -267,14 +267,25 @@ int main() {
- ])])
- 
- 
-+PHP_ARG_WITH([external-libcrypt],
-+  [for external libcrypt or libxcrypt],
-+  [AS_HELP_STRING([--with-external-libcrypt],
-+    [Use external libcrypt or libxcrypt])],
-+  [no],
-+  [no])
-+
- dnl
- dnl If one of them is missing, use our own implementation, portable code is then possible
- dnl
-dnl TODO This is currently always enabled
-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || true; then
-  AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
-
-  PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
-+dnl This is currently enabled by default
-+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
-+  if test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
-+    AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
-+
-+    PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
-+   else
-+    AC_MSG_ERROR([Cannot use external libcrypt as some algo are missing])
-+   fi
- else
-   AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des])
- fi
--- a/php-8.0.6-deprecated.patch
+++ b/php-8.0.6-deprecated.patch
@ -1,400 +0,0 @@
-From 4dc8b3c0efaae25b08c8f59b068f17c97c59d0ae Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 5 May 2021 15:41:00 +0200
-Subject: [PATCH] get rid of inet_aton and inet_ntoa use inet_ntop iand
- inet_pton where available standardize buffer size
-
---
- ext/sockets/sockaddr_conv.c |  4 ++++
- ext/sockets/sockets.c       | 48 +++++++++++++++++++++++++------------
- ext/standard/dns.c          | 16 ++++++++++++-
- main/network.c              | 20 ++++++++++++++--
- 4 files changed, 70 insertions(+), 18 deletions(-)
-
-diff --git a/ext/sockets/sockaddr_conv.c b/ext/sockets/sockaddr_conv.c
-index 57996612d2d7e..65c8418fb3a6f 100644
--- a/ext/sockets/sockaddr_conv.c
-+++ b/ext/sockets/sockaddr_conv.c
-@@ -87,7 +87,11 @@ int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_soc
- 	struct in_addr tmp;
- 	struct hostent *host_entry;
- 
-+#ifdef HAVE_INET_PTON
-+	if (inet_pton(AF_INET, string, &tmp)) {
-+#else
- 	if (inet_aton(string, &tmp)) {
-+#endif
- 		sin->sin_addr.s_addr = tmp.s_addr;
- 	} else {
- 		if (strlen(string) > MAXFQDNLEN || ! (host_entry = php_network_gethostbyname(string))) {
-diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
-index 16ad3e8013a4c..85c938d1b97b1 100644
--- a/ext/sockets/sockets.c
-+++ b/ext/sockets/sockets.c
-@@ -220,8 +220,10 @@ zend_module_entry sockets_module_entry = {
- ZEND_GET_MODULE(sockets)
- #endif
- 
-+#ifndef HAVE_INET_NTOP
- /* inet_ntop should be used instead of inet_ntoa */
- int inet_ntoa_lock = 0;
-+#endif
- 
- static int php_open_listen_sock(php_socket *sock, int port, int backlog) /* {{{ */
- {
-@@ -1082,10 +1084,12 @@ PHP_FUNCTION(socket_getsockname)
- 	struct sockaddr_in		*sin;
- #if HAVE_IPV6
- 	struct sockaddr_in6		*sin6;
-	char					addr6[INET6_ADDRSTRLEN+1];
-+#endif
-+#ifdef HAVE_INET_NTOP
-+	char					addrbuf[INET6_ADDRSTRLEN];
- #endif
- 	struct sockaddr_un		*s_un;
-	char					*addr_string;
-+	const char				*addr_string;
- 	socklen_t				salen = sizeof(php_sockaddr_storage);
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz|z", &arg1, socket_ce, &addr, &port) == FAILURE) {
-@@ -1106,8 +1110,8 @@ PHP_FUNCTION(socket_getsockname)
- #if HAVE_IPV6
- 		case AF_INET6:
- 			sin6 = (struct sockaddr_in6 *) sa;
-			inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN);
-			ZEND_TRY_ASSIGN_REF_STRING(addr, addr6);
-+			inet_ntop(AF_INET6, &sin6->sin6_addr,  addrbuf, sizeof(addrbuf));
-+			ZEND_TRY_ASSIGN_REF_STRING(addr, addrbuf);
- 
- 			if (port != NULL) {
- 				ZEND_TRY_ASSIGN_REF_LONG(port, htons(sin6->sin6_port));
-@@ -1117,11 +1121,14 @@ PHP_FUNCTION(socket_getsockname)
- #endif
- 		case AF_INET:
- 			sin = (struct sockaddr_in *) sa;
-+#ifdef HAVE_INET_NTOP
-+			addr_string = inet_ntop(AF_INET, &sin->sin_addr, addrbuf, sizeof(addrbuf));
-+#else
- 			while (inet_ntoa_lock == 1);
- 			inet_ntoa_lock = 1;
- 			addr_string = inet_ntoa(sin->sin_addr);
- 			inet_ntoa_lock = 0;
-
-+#endif
- 			ZEND_TRY_ASSIGN_REF_STRING(addr, addr_string);
- 
- 			if (port != NULL) {
-@@ -1154,10 +1161,12 @@ PHP_FUNCTION(socket_getpeername)
- 	struct sockaddr_in		*sin;
- #if HAVE_IPV6
- 	struct sockaddr_in6		*sin6;
-	char					addr6[INET6_ADDRSTRLEN+1];
-+#endif
-+#ifdef HAVE_INET_NTOP
-+	char					addrbuf[INET6_ADDRSTRLEN];
- #endif
- 	struct sockaddr_un		*s_un;
-	char					*addr_string;
-+	const char				*addr_string;
- 	socklen_t				salen = sizeof(php_sockaddr_storage);
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz|z", &arg1, socket_ce, &arg2, &arg3) == FAILURE) {
-@@ -1178,9 +1187,9 @@ PHP_FUNCTION(socket_getpeername)
- #if HAVE_IPV6
- 		case AF_INET6:
- 			sin6 = (struct sockaddr_in6 *) sa;
-			inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN);
-+			inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
- 
-			ZEND_TRY_ASSIGN_REF_STRING(arg2, addr6);
-+			ZEND_TRY_ASSIGN_REF_STRING(arg2, addrbuf);
- 
- 			if (arg3 != NULL) {
- 				ZEND_TRY_ASSIGN_REF_LONG(arg3, htons(sin6->sin6_port));
-@@ -1191,11 +1200,14 @@ PHP_FUNCTION(socket_getpeername)
- #endif
- 		case AF_INET:
- 			sin = (struct sockaddr_in *) sa;
-+#ifdef HAVE_INET_NTOP
-+			addr_string = inet_ntop(AF_INET, &sin->sin_addr, addrbuf, sizeof(addrbuf));
-+#else
- 			while (inet_ntoa_lock == 1);
- 			inet_ntoa_lock = 1;
- 			addr_string = inet_ntoa(sin->sin_addr);
- 			inet_ntoa_lock = 0;
-
-+#endif
- 			ZEND_TRY_ASSIGN_REF_STRING(arg2, addr_string);
- 
- 			if (arg3 != NULL) {
-@@ -1527,12 +1539,14 @@ PHP_FUNCTION(socket_recvfrom)
- 	struct sockaddr_in	sin;
- #if HAVE_IPV6
- 	struct sockaddr_in6	sin6;
-	char				addr6[INET6_ADDRSTRLEN];
-+#endif
-+#ifdef HAVE_INET_NTOP
-+	char				addrbuf[INET6_ADDRSTRLEN];
- #endif
- 	socklen_t			slen;
- 	int					retval;
- 	zend_long				arg3, arg4;
-	char				*address;
-+	const char			*address;
- 	zend_string			*recv_buf;
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ozllz|z", &arg1, socket_ce, &arg2, &arg3, &arg4, &arg5, &arg6) == FAILURE) {
-@@ -1590,7 +1604,11 @@ PHP_FUNCTION(socket_recvfrom)
- 			ZSTR_LEN(recv_buf) = retval;
- 			ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
- 
-+#ifdef HAVE_INET_NTOP
-+			address = inet_ntop(AF_INET, &sin.sin_addr, addrbuf, sizeof(addrbuf));
-+#else
- 			address = inet_ntoa(sin.sin_addr);
-+#endif
- 
- 			ZEND_TRY_ASSIGN_REF_NEW_STR(arg2, recv_buf);
- 			ZEND_TRY_ASSIGN_REF_STRING(arg5, address ? address : "0.0.0.0");
-@@ -1617,11 +1635,11 @@ PHP_FUNCTION(socket_recvfrom)
- 			ZSTR_LEN(recv_buf) = retval;
- 			ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0';
- 
-			memset(addr6, 0, INET6_ADDRSTRLEN);
-			inet_ntop(AF_INET6, &sin6.sin6_addr, addr6, INET6_ADDRSTRLEN);
-+			memset(addrbuf, 0, INET6_ADDRSTRLEN);
-+			inet_ntop(AF_INET6, &sin6.sin6_addr,  addrbuf, sizeof(addrbuf));
- 
- 			ZEND_TRY_ASSIGN_REF_NEW_STR(arg2, recv_buf);
-			ZEND_TRY_ASSIGN_REF_STRING(arg5, addr6[0] ? addr6 : "::");
-+			ZEND_TRY_ASSIGN_REF_STRING(arg5, addrbuf[0] ? addrbuf : "::");
- 			ZEND_TRY_ASSIGN_REF_LONG(arg6, ntohs(sin6.sin6_port));
- 			break;
- #endif
-diff --git a/ext/standard/dns.c b/ext/standard/dns.c
-index 41b98424edb60..6efdbbe894b46 100644
--- a/ext/standard/dns.c
-+++ b/ext/standard/dns.c
-@@ -228,6 +228,9 @@ PHP_FUNCTION(gethostbynamel)
- 	struct hostent *hp;
- 	struct in_addr in;
- 	int i;
-+#ifdef HAVE_INET_NTOP
-+	char addr4[INET_ADDRSTRLEN];
-+#endif
- 
- 	ZEND_PARSE_PARAMETERS_START(1, 1)
- 		Z_PARAM_PATH(hostname, hostname_len)
-@@ -255,7 +258,11 @@ PHP_FUNCTION(gethostbynamel)
- 		}
- 
- 		in = *h_addr_entry;
-+#ifdef HAVE_INET_NTOP
-+		add_next_index_string(return_value, inet_ntop(AF_INET, &in, addr4, INET_ADDRSTRLEN));
-+#else
- 		add_next_index_string(return_value, inet_ntoa(in));
-+#endif
- 	}
- }
- /* }}} */
-@@ -266,7 +273,10 @@ static zend_string *php_gethostbyname(char *name)
- 	struct hostent *hp;
- 	struct in_addr *h_addr_0; /* Don't call this h_addr, it's a macro! */
- 	struct in_addr in;
-	char *address;
-+#ifdef HAVE_INET_NTOP
-+	char addr4[INET_ADDRSTRLEN];
-+#endif
-+	const char *address;
- 
- 	hp = php_network_gethostbyname(name);
- 	if (!hp) {
-@@ -281,7 +291,11 @@ static zend_string *php_gethostbyname(char *name)
- 
- 	memcpy(&in.s_addr, h_addr_0, sizeof(in.s_addr));
- 
-+#ifdef HAVE_INET_NTOP
-+	address = inet_ntop(AF_INET, &in, addr4, INET_ADDRSTRLEN);
-+#else
- 	address = inet_ntoa(in);
-+#endif
- 	return zend_string_init(address, strlen(address), 0);
- }
- /* }}} */
-diff --git a/main/network.c b/main/network.c
-index 2c504952b2dd1..7f2f714ec42df 100644
--- a/main/network.c
-+++ b/main/network.c
-@@ -236,8 +236,12 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
- 	} while ((sai = sai->ai_next) != NULL);
- 
- 	freeaddrinfo(res);
-+#else
-+#ifdef HAVE_INET_PTON
-+	if (!inet_pton(AF_INET, host, &in)) {
- #else
- 	if (!inet_aton(host, &in)) {
-+#endif
- 		if(strlen(host) > MAXFQDNLEN) {
- 			host_info = NULL;
- 			errno = E2BIG;
-@@ -555,7 +559,11 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_lo
- 		goto out;
- 	}
- #endif
-+#ifdef HAVE_INET_PTON
-+	if (inet_pton(AF_INET, tmp, &in4->sin_addr) > 0) {
-+#else
- 	if (inet_aton(tmp, &in4->sin_addr) > 0) {
-+#endif
- 		in4->sin_port = htons(port);
- 		in4->sin_family = AF_INET;
- 		*sl = sizeof(struct sockaddr_in);
-@@ -617,15 +625,19 @@ PHPAPI void php_network_populate_name_from_sockaddr(
- 	}
- 
- 	if (textaddr) {
-#if HAVE_IPV6 && HAVE_INET_NTOP
-+#ifdef HAVE_INET_NTOP
- 		char abuf[256];
- #endif
-		char *buf = NULL;
-+		const char *buf = NULL;
- 
- 		switch (sa->sa_family) {
- 			case AF_INET:
- 				/* generally not thread safe, but it *is* thread safe under win32 */
-+#ifdef HAVE_INET_NTOP
-+				buf = inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr, (char *)&abuf, sizeof(abuf));
-+#else
- 				buf = inet_ntoa(((struct sockaddr_in*)sa)->sin_addr);
-+#endif
- 				if (buf) {
- 					*textaddr = strpprintf(0, "%s:%d",
- 						buf, ntohs(((struct sockaddr_in*)sa)->sin_port));
-@@ -862,7 +874,11 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
- 
- 					in4->sin_family = sa->sa_family;
- 					in4->sin_port = htons(bindport);
-+#ifdef HAVE_INET_PTON
-+					if (!inet_pton(AF_INET, bindto, &in4->sin_addr)) {
-+#else
- 					if (!inet_aton(bindto, &in4->sin_addr)) {
-+#endif
- 						php_error_docref(NULL, E_WARNING, "Invalid IP Address: %s", bindto);
- 						goto skip_bind;
- 					}
-From e5b6f43ec7813392d83ea586b7902e0396a1f792 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 6 May 2021 14:21:29 +0200
-Subject: [PATCH] get rid of inet_addr usage
-
---
- main/fastcgi.c            | 4 ++++
- sapi/litespeed/lsapilib.c | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/main/fastcgi.c b/main/fastcgi.c
-index 071f69d3a7f0..c936d42405de 100644
--- a/main/fastcgi.c
-+++ b/main/fastcgi.c
-@@ -688,8 +688,12 @@ int fcgi_listen(const char *path, int backlog)
- 		if (!*host || !strncmp(host, "*", sizeof("*")-1)) {
- 			sa.sa_inet.sin_addr.s_addr = htonl(INADDR_ANY);
- 		} else {
-+#ifdef HAVE_INET_PTON
-+			if (!inet_pton(AF_INET, host, &sa.sa_inet.sin_addr)) {
-+#else
- 			sa.sa_inet.sin_addr.s_addr = inet_addr(host);
- 			if (sa.sa_inet.sin_addr.s_addr == INADDR_NONE) {
-+#endif
- 				struct hostent *hep;
- 
- 				if(strlen(host) > MAXFQDNLEN) {
-diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
-index a72b5dc1b988..305f3326a682 100644
--- a/sapi/litespeed/lsapilib.c
-+++ b/sapi/litespeed/lsapilib.c
-@@ -2672,8 +2672,12 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
-             ((struct sockaddr_in *)pAddr)->sin_addr.s_addr = htonl( INADDR_LOOPBACK );
-         else
-         {
-+#ifdef HAVE_INET_PTON
-+            if (!inet_pton(AF_INET, p, &((struct sockaddr_in *)pAddr)->sin_addr))
-+#else
-             ((struct sockaddr_in *)pAddr)->sin_addr.s_addr = inet_addr( p );
-             if ( ((struct sockaddr_in *)pAddr)->sin_addr.s_addr == INADDR_BROADCAST)
-+#endif
-             {
-                 doAddrInfo = 1;
-             }
-From 99d67d121acd4c324738509679d23acaf759d065 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 6 May 2021 16:35:48 +0200
-Subject: [PATCH] use getnameinfo instead of gethostbyaddr
-
---
- ext/standard/dns.c | 34 ++++++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 12 deletions(-)
-
-diff --git a/ext/standard/dns.c b/ext/standard/dns.c
-index edd9a4549f5c..540c777faaba 100644
--- a/ext/standard/dns.c
-+++ b/ext/standard/dns.c
-@@ -169,20 +169,30 @@ PHP_FUNCTION(gethostbyaddr)
- static zend_string *php_gethostbyaddr(char *ip)
- {
- #if HAVE_IPV6 && HAVE_INET_PTON
-	struct in6_addr addr6;
-#endif
-	struct in_addr addr;
-	struct hostent *hp;
-+	struct sockaddr_in sa4;
-+	struct sockaddr_in6 sa6;
-+	char out[NI_MAXHOST];
- 
-#if HAVE_IPV6 && HAVE_INET_PTON
-	if (inet_pton(AF_INET6, ip, &addr6)) {
-		hp = gethostbyaddr((char *) &addr6, sizeof(addr6), AF_INET6);
-	} else if (inet_pton(AF_INET, ip, &addr)) {
-		hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
-	} else {
-		return NULL;
-+	if (inet_pton(AF_INET6, ip, &sa6.sin6_addr)) {
-+		sa6.sin6_family = AF_INET6;
-+
-+		if (getnameinfo((struct sockaddr *)&sa6, sizeof(sa6), out, sizeof(out), NULL, 0, NI_NAMEREQD) < 0) {
-+			return zend_string_init(ip, strlen(ip), 0);
-+		}
-+		return zend_string_init(out, strlen(out), 0);
-+	} else if (inet_pton(AF_INET, ip, &sa4.sin_addr)) {
-+		sa4.sin_family = AF_INET;
-+
-+		if (getnameinfo((struct sockaddr *)&sa4, sizeof(sa4), out, sizeof(out), NULL, 0, NI_NAMEREQD) < 0) {
-+			return zend_string_init(ip, strlen(ip), 0);
-+		}
-+		return zend_string_init(out, strlen(out), 0);
- 	}
-+	return NULL; /* not a valid IP */
- #else
-+	struct in_addr addr;
-+	struct hostent *hp;
-+
- 	addr.s_addr = inet_addr(ip);
- 
- 	if (addr.s_addr == -1) {
-@@ -190,13 +200,13 @@ static zend_string *php_gethostbyaddr(char *ip)
- 	}
- 
- 	hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
-#endif
- 
- 	if (!hp || hp->h_name == NULL || hp->h_name[0] == '\0') {
- 		return zend_string_init(ip, strlen(ip), 0);
- 	}
- 
- 	return zend_string_init(hp->h_name, strlen(hp->h_name), 0);
-+#endif
- }
- /* }}} */
- 
--- a/php-8.1.0-libdb.patch
+++ b/php-8.1.0-libdb.patch
@ -79,7 +79,7 @@ diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c
 PHP_MINIT_FUNCTION(dba);
 PHP_MSHUTDOWN_FUNCTION(dba);
 PHP_MINFO_FUNCTION(dba);
-@@ -459,6 +463,10 @@ PHP_MINFO_FUNCTION(dba)
+@@ -452,6 +456,10 @@ PHP_MINFO_FUNCTION(dba)
 
 	php_info_print_table_start();
 	php_info_print_table_row(2, "DBA support", "enabled");
--- a/php-8.1.0-parser.patch
+++ b/php-8.1.0-parser.patch
@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
 +        return;
 +    }
 +
-     $version = "4.9.0";
+     $version = "4.12.0";
     $phpParserDir = __DIR__ . "/PHP-Parser-$version";
     if (!is_dir($phpParserDir)) {
--- a/php-8.1.0-phpinfo.patch
+++ b/php-8.1.0-phpinfo.patch
@ -0,0 +1,44 @@
+
+Drop "Configure Command" from phpinfo as it doesn't
+provide any useful information.
+The available extensions are not related to this command.
+
+Replace full GCC name by gcc in php -v output
+
+
+diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
+--- ./ext/standard/info.c.phpinfo	2020-07-21 10:49:31.000000000 +0200
+++ ./ext/standard/info.c	2020-07-21 11:41:56.295633523 +0200
+@@ -805,9 +805,6 @@ PHPAPI ZEND_COLD void php_print_info(int
+ #ifdef PHP_BUILD_ARCH
+ 		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
+ #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 ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
+--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2020-07-21 10:49:31.000000000 +0200
+++ ./ext/standard/tests/general_functions/phpinfo.phpt	2020-07-21 11:41:56.296633522 +0200
+@@ -17,7 +17,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 -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
+--- ./sapi/cli/php_cli.c.phpinfo	2020-07-21 11:43:38.812475300 +0200
+++ ./sapi/cli/php_cli.c	2020-07-21 11:43:45.783464540 +0200
+@@ -645,7 +645,7 @@ static int do_cli(int argc, char **argv)
+ 					"NTS"
+ #endif
+ #ifdef PHP_BUILD_COMPILER
+-					" " PHP_BUILD_COMPILER
+					" gcc"
+ #endif
+ #ifdef PHP_BUILD_ARCH
+ 					" " PHP_BUILD_ARCH
--- a/php-8.0.10-systzdata-v20.patch
+++ b/php-8.0.10-systzdata-v20.patch
@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather
 than embedding a copy.  Discussed upstream but was not desired.

 History:
+r21: adapt for timelib 2021.03 (in 8.1.0)
 r20: adapt for timelib 2020.03 (in 8.0.10RC1)
 r19: adapt for timelib 2020.02 (in 8.0.0beta2)
 r18: adapt for autotool change in 7.3.3RC1
@ -31,9 +32,9 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision

-diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
--- ./ext/date/config0.m4.systzdata	2021-08-10 11:35:28.000000000 +0200
-+++ ./ext/date/config0.m4	2021-08-10 12:09:41.067003517 +0200
+diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata php-8.0.0beta3/ext/date/config0.m4
+--- php-8.0.0beta3/ext/date/config0.m4.systzdata	2020-09-01 19:13:26.000000000 +0200
+++ php-8.0.0beta3/ext/date/config0.m4	2020-09-02 08:07:51.039979873 +0200
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
 dnl Check for strtoll, atoll
 AC_CHECK_FUNCS(strtoll atoll)
@ -51,13 +52,13 @@ diff -up ./ext/date/config0.m4.systzdata ./ext/date/config0.m4
 +   fi
 +fi
 +
- PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
+ PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
                  lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
-diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
--- ./ext/date/lib/parse_tz.c.systzdata	2021-08-10 11:35:28.000000000 +0200
-+++ ./ext/date/lib/parse_tz.c	2021-08-10 12:12:13.191605207 +0200
-@@ -26,8 +26,21 @@
+diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata php-8.0.0beta3/ext/date/lib/parse_tz.c
+--- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata	2020-09-01 19:13:26.000000000 +0200
+++ php-8.0.0beta3/ext/date/lib/parse_tz.c	2020-09-02 08:07:51.039979873 +0200
+@@ -26,9 +26,22 @@
 #include "timelib.h"
 #include "timelib_private.h"
 
@ -72,6 +73,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 +
 +#else
 #define TIMELIB_SUPPORTS_V2DATA
+ #define TIMELIB_SUPPORT_SLIM_FILE
 #include "timezonedb.h"
 +#endif
 +
@ -79,7 +81,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 
 #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
 # if defined(__LITTLE_ENDIAN__)
-@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
+@@ -95,6 +108,11 @@ static int read_php_preamble(const unsig
 {
 	uint32_t version;
 
@ -91,7 +93,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 	/* read ID */
 	version = (*tzf)[3] - '0';
 	*tzf += 4;
-@@ -435,7 +453,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -577,7 +595,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
 	}
 }
 
@ -522,7 +524,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 {
 	int left = 0, right = tzdb->index_size - 1;
 
-@@ -461,9 +901,48 @@ static int seek_to_tz_position(const uns
+@@ -603,9 +1043,48 @@ static int seek_to_tz_position(const uns
 	return 0;
 }
 
@ -571,7 +573,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 }
 
 const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -475,7 +954,30 @@ const timelib_tzdb_index_entry *timelib_
+@@ -617,7 +1096,30 @@ const timelib_tzdb_index_entry *timelib_
 int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
 {
 	const unsigned char *tzf;
@ -603,7 +605,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 }
 
 static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -517,6 +1019,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
+@@ -662,6 +1164,8 @@ static timelib_tzinfo* timelib_tzinfo_ct
 timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
 {
 	const unsigned char *tzf;
@ -612,7 +614,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 	timelib_tzinfo *tmp;
 	int version;
 	int transitions_result, types_result;
-@@ -524,7 +1028,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
+@@ -669,7 +1173,7 @@ timelib_tzinfo *timelib_parse_tzfile(con
 
 	*error_code = TIMELIB_ERROR_NO_ERROR;
 
@ -621,9 +623,9 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
 		tmp = timelib_tzinfo_ctor(timezone);
 
 		version = read_preamble(&tzf, tmp, &type);
-@@ -563,11 +1067,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
+@@ -712,11 +1216,36 @@ timelib_tzinfo *timelib_parse_tzfile(con
+ 			return NULL;
 		}
- 		skip_posix_string(&tzf, tmp);
 
 +#ifdef HAVE_SYSTEM_TZDATA
 +		if (memmap) {
--- a/php.ini
+++ b/php.ini
--- a/php.spec
+++ b/php.spec
@ -7,8 +7,8 @@
 #

 # API/ABI check
-%global apiver      20200930
-%global zendver     20200930
+%global apiver      20210902
+%global zendver     20210902
 %global pdover      20170320

 # we don't want -z defs linker flag
@ -18,7 +18,7 @@
 %global _hardened_build 1

 # version used for php embedded library soname
-%global embed_version 8.0
+%global embed_version 8.1

 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)

@ -64,20 +64,21 @@
 %bcond_with      imap
 %bcond_without   lmdb

-%global upver        8.0.12
-#global rcver        RC1
+%global upver        8.1.0
+%global rcver        RC5

 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
 # main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0
 # ext/date/lib is MIT
 # Zend/zend_sort is NCSA
-License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA
+# Zend/asm is Boost
+License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA and Boost
 URL: http://www.php.net/

 Source0: https://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
@ -104,31 +105,20 @@ Source53: 20-ffi.ini
 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
+Patch8: php-8.1.0-libdb.patch

 # Functional changes
 # Use system nikic/php-parser
-Patch41: php-8.0.0-parser.patch
+Patch41: php-8.1.0-parser.patch
 # use system tzdata
-Patch42: php-8.0.10-systzdata-v20.patch
+Patch42: php-8.1.0-systzdata-v21.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
-# add sha256 / sha512 security protocol, from 8.1
-Patch48: php-8.0.10-snmp-sha.patch
-# switch phar to use sha256 signature by default, from 8.1
-# implement openssl_256 and openssl_512 for phar signatures, from 8.1
-Patch49: php-8.0.10-phar-sha.patch
-# compatibility with OpenSSL 3.0, from 8.1
-Patch50: php-8.0.10-openssl3.patch
-# use system libxcrypt
-Patch51: php-8.0.12-crypt.patch
+Patch47: php-8.1.0-phpinfo.patch

 # Upstream fixes (100+)

@ -150,7 +140,7 @@ BuildRequires: httpd-filesystem
 BuildRequires: nginx-filesystem
 BuildRequires: 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
@ -169,6 +159,7 @@ BuildRequires: libtool-ltdl-devel
 BuildRequires: systemtap-sdt-devel
 # used for tests
 BuildRequires: %{_bindir}/ps
+BuildRequires: tzdata

 %if %{with zts}
 Provides: php-zts = %{version}-%{release}
@ -321,7 +312,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
 Requires: pcre2-devel%{?_isa}
 Requires: zlib-devel%{?_isa}
 %if %{with zts}
@ -360,7 +351,7 @@ License: PHP
 Requires: 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
@ -376,7 +367,7 @@ License: PHP
 Requires: 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 php-ldap adds Lightweight Directory Access Protocol (LDAP)
@ -428,7 +419,7 @@ Requires: php-pdo%{?_isa} = %{version}-%{release}
 Provides: php_database
 Provides: php-pdo_pgsql, php-pdo_pgsql%{?_isa}
 BuildRequires: krb5-devel
-BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: openssl-devel >= 1.0.2
 BuildRequires: libpq-devel

 %description pgsql
@ -721,7 +712,6 @@ in pure PHP.
 %patch5 -p1 -b .includedir
 %patch6 -p1 -b .embed
 %patch8 -p1 -b .libdb
-%patch9 -p1 -b .deprecated

 %patch42 -p1 -b .systzdata
 %patch43 -p1 -b .headers
@ -729,11 +719,6 @@ in pure PHP.
 %patch45 -p1 -b .ldap_r
 %endif
 %patch47 -p1 -b .phpinfo
-%patch48 -p1 -b .sha
-%patch49 -p1 -b .pharsha
-%patch50 -p1 -b .openssl3
-rm ext/openssl/tests/p12_with_extra_certs.p12
-%patch51 -p1 -b .libxcrypt

 # upstream patches

@ -746,6 +731,7 @@ rm ext/openssl/tests/p12_with_extra_certs.p12
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
+cp Zend/asm/LICENSE BOOST_LICENSE
 cp sapi/fpm/LICENSE fpm_LICENSE
 cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE
 cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE
@ -1418,7 +1404,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :

 %files common -f files.common
 %doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs
-%license LICENSE TSRM_LICENSE ZEND_LICENSE
+%license LICENSE TSRM_LICENSE ZEND_LICENSE BOOST_LICENSE
 %license libmagic_LICENSE
 %license timelib_LICENSE
 %doc php.ini-*
@ -1554,6 +1540,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :


 %changelog
+* Tue Oct 26 2021 Remi Collet <remi@remirepo.net> - 8.1.0~RC5-1
+- update to 8.1.0RC5 - https://fedoraproject.org/wiki/Changes/php81
+- bump API version
+
 * Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 8.0.12-2
 - dba: enable qdbm backend

--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (php-8.0.12.tar.xz) = 927b15c4443f3741a5325ec7bf387987b405cd5e64e40fd81f1945bf073adda30eeede8e1f98185f505cb61f969cf1abe05b8dad57a3c4e87971e8037bb16b23
-SHA512 (php-8.0.12.tar.xz.asc) = 90c8a179651ad530c8cb162a3d7f08472dd82a8c1b667b2df6ad0fd7c1cc1b97f18f8e13cae62d1176b36d579a1bd0646957631612a3ca11658d37c0dc6ff70b
+SHA512 (php-8.1.0RC5.tar.xz) = ee8c29b0bbe688346837e7f3227f07b354f20b8e783fbeb79d692528089b8e23ad1980659c6ea470d98b07da1735b81ebb52eb378b3161b4cde5e22678bbb0b7
+SHA512 (php-8.1.0RC5.tar.xz.asc) = 5b61bf8f59a0d042823fd545d49ea03ddb0662c06e60a84952e1e9e791f5f89b86b59de2fd8bf034c3c1b418de40f42b03486e7d2dd9816a6cd98f7809dedaa4