Compare commits
64 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
8faf123679 | ||
|
2ab121573e | ||
|
5a86f70e63 | ||
|
f6665a931f | ||
|
3576cbaef0 | ||
|
af9f86ceb5 | ||
|
a4ba436f97 | ||
|
fa19cf6335 | ||
|
0238007d88 | ||
|
d66fcc7daf | ||
|
19b0b1668f | ||
|
6993e0695d | ||
|
69192ff176 | ||
|
755e3496fd | ||
|
6dd1920dd7 | ||
|
d489ea0802 | ||
|
2d463a7153 | ||
|
f844eec7be | ||
|
ff3814718d | ||
|
25dc43305f | ||
|
1add2cd4e6 | ||
|
7ab7efb1bd | ||
|
13d3b77aa4 | ||
|
450a461672 | ||
|
a9a4fca7a0 | ||
|
0a22aad64c | ||
|
88b84ffce0 | ||
|
92601500d9 | ||
|
37182d26c7 | ||
|
f3afad23d2 | ||
|
44fd4ef0f2 | ||
|
b4e6f840ef | ||
|
c0adc24f5a | ||
|
50fa292635 | ||
|
1ee1cfef0c | ||
|
0b9a8ee2ec | ||
|
42a07890d8 | ||
|
31518f807b | ||
|
1229fe513f | ||
|
54f28c61e6 | ||
|
47a1883a7a | ||
|
027e8700a9 | ||
|
776db4464b | ||
|
84be9b78aa | ||
|
fedcf3abbf | ||
|
201b3d3cc4 | ||
|
6599c5d0e2 | ||
|
4ce1473fc7 | ||
|
500697108d | ||
|
67fdb8237a | ||
|
427d0993cb | ||
|
9d310b6c56 | ||
|
1cf429c597 | ||
|
627a253868 | ||
|
f176e21d38 | ||
|
c87dfed745 | ||
|
7113f618aa | ||
|
5471f0ee34 | ||
|
31a991806e | ||
|
5a53ca7118 | ||
|
dbb5d5a908 | ||
|
21e824d6aa | ||
|
a0432e7613 | ||
|
1deadff17e |
48
.gitignore
vendored
48
.gitignore
vendored
@ -4,29 +4,25 @@ TODO
|
||||
php-5.*.xz
|
||||
php-7.*.xz
|
||||
php-7.*.xz.asc
|
||||
/php-8.0.3.tar.xz
|
||||
/php-8.0.3.tar.xz.asc
|
||||
/php-8.0.4RC1.tar.xz
|
||||
/php-8.0.4RC1.tar.xz.asc
|
||||
/php-8.0.5RC1.tar.xz
|
||||
/php-8.0.5RC1.tar.xz.asc
|
||||
/php-8.0.5.tar.xz
|
||||
/php-8.0.5.tar.xz.asc
|
||||
/php-8.0.6.tar.xz
|
||||
/php-8.0.6.tar.xz.asc
|
||||
/php-8.0.7RC1.tar.xz
|
||||
/php-8.0.7RC1.tar.xz.asc
|
||||
/php-8.0.7.tar.xz
|
||||
/php-8.0.7.tar.xz.asc
|
||||
/php-8.0.8RC1.tar.xz
|
||||
/php-8.0.8RC1.tar.xz.asc
|
||||
/php-8.0.8.tar.xz
|
||||
/php-8.0.8.tar.xz.asc
|
||||
/php-8.0.9RC1.tar.xz
|
||||
/php-8.0.9RC1.tar.xz.asc
|
||||
/php-8.0.9.tar.xz
|
||||
/php-8.0.9.tar.xz.asc
|
||||
/php-8.0.10RC1.tar.xz
|
||||
/php-8.0.10RC1.tar.xz.asc
|
||||
/php-8.0.10.tar.xz
|
||||
/php-8.0.10.tar.xz.asc
|
||||
/php-8.0.*.tar.xz
|
||||
/php-8.0.*.tar.xz.asc
|
||||
/php-8.1.*.tar.xz
|
||||
/php-8.1.*.tar.xz.asc
|
||||
/php-8.2.0RC5.tar.xz
|
||||
/php-8.2.0RC5.tar.xz.asc
|
||||
/php-8.2.0RC6.tar.xz
|
||||
/php-8.2.0RC6.tar.xz.asc
|
||||
/php-8.2.0RC7.tar.xz
|
||||
/php-8.2.0RC7.tar.xz.asc
|
||||
/php-8.2.0.tar.xz
|
||||
/php-8.2.0.tar.xz.asc
|
||||
/php-8.2.1RC1.tar.xz
|
||||
/php-8.2.1RC1.tar.xz.asc
|
||||
/php-8.2.1.tar.xz
|
||||
/php-8.2.1.tar.xz.asc
|
||||
/php-8.2.2RC1.tar.xz
|
||||
/php-8.2.2RC1.tar.xz.asc
|
||||
/php-8.2.2.tar.xz
|
||||
/php-8.2.2.tar.xz.asc
|
||||
/php-8.2.3.tar.xz
|
||||
/php-8.2.3.tar.xz.asc
|
||||
|
@ -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
|
||||
|
||||
@ -110,7 +115,12 @@ opcache.blacklist_filename=/etc/php.d/opcache*.blacklist
|
||||
;opcache.file_cache_fallback=1
|
||||
|
||||
; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
|
||||
; This should improve performance, but requires appropriate OS configuration.
|
||||
; Under certain circumstances (if only a single global PHP process is
|
||||
; started from which all others fork), this can increase performance
|
||||
; by a tiny amount because TLB misses are reduced. On the other hand, this
|
||||
; delays PHP startup, increases memory usage and degrades performance
|
||||
; under memory pressure - use with care.
|
||||
; Requires appropriate OS configuration.
|
||||
opcache.huge_code_pages=0
|
||||
|
||||
; Validate cached file permissions.
|
||||
@ -131,12 +141,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
|
||||
|
16
gating.yaml
Normal file
16
gating.yaml
Normal file
@ -0,0 +1,16 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts: [bodhi_update_push_testing]
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
|
||||
#gating rawhide
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts: [bodhi_update_push_stable]
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
@ -24,7 +24,11 @@ foreach ($text as $line) {
|
||||
if ($debug) echo "+ Ignore $line\n";
|
||||
continue;
|
||||
}
|
||||
$github = 'https://github.com/php/php-src';
|
||||
|
||||
$line = preg_replace('/(#[0-9]+)/', 'php\1', $line);
|
||||
$line = preg_replace('/(GH-([0-9]+))/', "[\\1]($github/issues/\\2)", $line);
|
||||
$line = preg_replace('/(GHSA-([^ ]+))/', "[\\1]($github/security/advisories/\\1)", $line);
|
||||
$line = preg_replace('/(CVE-[0-9]+-[0-9]+)/', '**\1**', $line);
|
||||
if (empty($line)) {
|
||||
echo "\n\n";
|
||||
|
@ -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
|
@ -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);
|
||||
}
|
@ -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)
|
@ -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
|
||||
}
|
||||
/* }}} */
|
||||
|
@ -79,10 +79,10 @@ 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");
|
||||
php_info_print_table_row(2, "DBA support", "enabled");
|
||||
+#ifdef DB_VERSION_STRING
|
||||
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING);
|
||||
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL));
|
44
php-8.1.0-phpinfo.patch
Normal file
44
php-8.1.0-phpinfo.patch
Normal file
@ -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
|
@ -5,6 +5,8 @@ Add support for use of the system timezone database, rather
|
||||
than embedding a copy. Discussed upstream but was not desired.
|
||||
|
||||
History:
|
||||
r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi
|
||||
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 +33,10 @@ 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 --git a/ext/date/config0.m4 b/ext/date/config0.m4
|
||||
index 18b8106bd2..3d1f63c758 100644
|
||||
--- a/ext/date/config0.m4
|
||||
+++ b/ext/date/config0.m4
|
||||
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
|
||||
dnl Check for strtoll, atoll
|
||||
AC_CHECK_FUNCS(strtoll atoll)
|
||||
@ -51,13 +54,14 @@ 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 --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
|
||||
index e41315efdb..4b6547c0a3 100644
|
||||
--- a/ext/date/lib/parse_tz.c
|
||||
+++ b/ext/date/lib/parse_tz.c
|
||||
@@ -26,9 +26,22 @@
|
||||
#include "timelib.h"
|
||||
#include "timelib_private.h"
|
||||
|
||||
@ -72,6 +76,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 +84,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 unsigned char **tzf, timelib_tzinfo *tz)
|
||||
{
|
||||
uint32_t version;
|
||||
|
||||
@ -91,7 +96,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,467 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
|
||||
}
|
||||
}
|
||||
|
||||
@ -321,6 +326,44 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
|
||||
+ return timelib_strcasecmp(alpha->id, beta->id);
|
||||
+}
|
||||
+
|
||||
+/* Retrieve tzdata version. */
|
||||
+static void retrieve_zone_version(timelib_tzdb *db)
|
||||
+{
|
||||
+ static char buf[30];
|
||||
+ char path[PATH_MAX];
|
||||
+ FILE *fp;
|
||||
+
|
||||
+ strncpy(path, ZONEINFO_PREFIX "/tzdata.zi", sizeof(path));
|
||||
+
|
||||
+ fp = fopen(path, "r");
|
||||
+ if (fp) {
|
||||
+ if (fgets(buf, sizeof(buf), fp)) {
|
||||
+ if (!memcmp(buf, "# version ", 10) &&
|
||||
+ isdigit(buf[10]) &&
|
||||
+ isdigit(buf[11]) &&
|
||||
+ isdigit(buf[12]) &&
|
||||
+ isdigit(buf[13]) &&
|
||||
+ islower(buf[14])) {
|
||||
+ if (buf[14] >= 't') { /* 2022t = 2022.20 */
|
||||
+ buf[17] = 0;
|
||||
+ buf[16] = buf[14] - 't' + '0';
|
||||
+ buf[15] = '2';
|
||||
+ } else if (buf[14] >= 'j') { /* 2022j = 2022.10 */
|
||||
+ buf[17] = 0;
|
||||
+ buf[16] = buf[14] - 'j' + '0';
|
||||
+ buf[15] = '1';
|
||||
+ } else { /* 2022a = 2022.1 */
|
||||
+ buf[16] = 0;
|
||||
+ buf[15] = buf[14] - 'a' + '1';
|
||||
+ }
|
||||
+ buf[14] = '.';
|
||||
+ db->version = buf+10;
|
||||
+ }
|
||||
+ }
|
||||
+ fclose(fp);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/* Create the zone identifier index by trawling the filesystem. */
|
||||
+static void create_zone_index(timelib_tzdb *db)
|
||||
@ -522,7 +565,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 +1081,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -559,6 +602,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
|
||||
+ tmp->version = "0.system";
|
||||
+ tmp->data = NULL;
|
||||
+ create_zone_index(tmp);
|
||||
+ retrieve_zone_version(tmp);
|
||||
+ system_location_table = create_location_table();
|
||||
+ fake_data_segment(tmp, system_location_table);
|
||||
+ timezonedb_system = tmp;
|
||||
@ -571,7 +615,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 +1135,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
|
||||
int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)
|
||||
{
|
||||
const unsigned char *tzf;
|
||||
@ -603,7 +647,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 +1203,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name)
|
||||
timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code)
|
||||
{
|
||||
const unsigned char *tzf;
|
||||
@ -612,7 +656,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 +1212,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
|
||||
|
||||
*error_code = TIMELIB_ERROR_NO_ERROR;
|
||||
|
||||
@ -621,9 +665,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 +1255,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
|
||||
return NULL;
|
||||
}
|
||||
skip_posix_string(&tzf, tmp);
|
||||
|
||||
+#ifdef HAVE_SYSTEM_TZDATA
|
||||
+ if (memmap) {
|
||||
@ -658,3 +702,19 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
|
||||
} else {
|
||||
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
|
||||
tmp = NULL;
|
||||
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
|
||||
index cf4a11b8a2..cd49abc78d 100644
|
||||
--- a/ext/date/php_date.c
|
||||
+++ b/ext/date/php_date.c
|
||||
@@ -457,7 +457,11 @@ PHP_MINFO_FUNCTION(date)
|
||||
php_info_print_table_row(2, "date/time support", "enabled");
|
||||
php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION);
|
||||
php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version);
|
||||
+#ifdef HAVE_SYSTEM_TZDATA
|
||||
+ php_info_print_table_row(2, "Timezone Database", "system");
|
||||
+#else
|
||||
php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal");
|
||||
+#endif
|
||||
php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb));
|
||||
php_info_print_table_end();
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
|
||||
--- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200
|
||||
+++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200
|
||||
@@ -1075,6 +1075,12 @@ function initPhpParser() {
|
||||
@@ -3265,6 +3265,12 @@ function initPhpParser() {
|
||||
}
|
||||
|
||||
$isInitialized = true;
|
||||
@ -11,6 +11,6 @@ diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
$version = "4.9.0";
|
||||
$version = "4.15.1";
|
||||
$phpParserDir = __DIR__ . "/PHP-Parser-$version";
|
||||
if (!is_dir($phpParserDir)) {
|
10
php-fpm.conf
10
php-fpm.conf
@ -5,11 +5,6 @@
|
||||
; All relative paths in this configuration file are relative to PHP's install
|
||||
; prefix.
|
||||
|
||||
; Include one or more files. If glob(3) exists, it is used to include a bunch of
|
||||
; files from a glob(3) pattern. This directive can be used everywhere in the
|
||||
; file.
|
||||
include=/etc/php-fpm.d/*.conf
|
||||
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
; Global Options ;
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
@ -133,5 +128,8 @@ daemonize = yes
|
||||
; used in logs and stats. There is no limitation on the number of pools which
|
||||
; FPM can handle. Your system will tell you anyway :)
|
||||
|
||||
; See /etc/php-fpm.d/*.conf
|
||||
; Include one or more files. If glob(3) exists, it is used to include a bunch of
|
||||
; files from a glob(3) pattern. This directive can be used everywhere in the
|
||||
; file.
|
||||
include=/etc/php-fpm.d/*.conf
|
||||
|
||||
|
464
php-keyring.gpg
464
php-keyring.gpg
@ -103,20 +103,20 @@ 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
|
||||
@ -127,19 +127,19 @@ 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
|
||||
@ -298,118 +298,300 @@ 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
|
||||
bh57GXdFtudEaKvQbGW9yalYwuj7Yip5XJGttg==
|
||||
=XZOV
|
||||
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
|
||||
MJqAAWPZt1mVQtSJnTkuk98zK1AuAE8g/6rVLOjbscldtgtYy0bRqrtmDHQMPrNR
|
||||
ulekN2NEq5UasNDW+FINIDMCmXVQlPttqhplSeOA+30q+wMiGZkqwuIuiKBfSNKX
|
||||
KWWHSCJoDgZ5kpsDiIp+f5NDqoN4GVmQJ9mFeqqVZ90Y1c/xpBZJpd9U53g4vmmS
|
||||
Ur5sqW7045Gh/8wC8CqXEiHVWWJZpVn1qaxvFGN1nN1yaus0WIxvWAHYGS8x/uwe
|
||||
8q/1UfMAEQEAAbQhU2VyZ2V5IFBhbnRlbGVldiA8c2VyZ2V5QHBocC5uZXQ+iQJX
|
||||
BBMBCABBAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAhkBFiEE5gkT5N8gmQfY
|
||||
4w2WZZqXyc8qeVoFAmJrslYFCRDtclwACgkQZZqXyc8qeVqENhAAglRrXTkxTEFh
|
||||
e3KZwGzRUhszL/XX3xO2jmnFWoRHETLruTuTjYWTJSsHl41yY5lyYGuF8WYn3KKZ
|
||||
6CRIogJnenm9aHXh361wGqyooPx6gh17UxQXNAAxICHsPRKx4ygoqYN7gQMb0fJ3
|
||||
Qlf8Q5gCA3WRjO7oZJWL7ZOvI4Myt7c2Mg83rPnkCoY0HV3x4KdjKlfmnrrsvHLB
|
||||
VryVfwyQ01xTHg8AJvbQfHzKh2QzpRdY6ZfhW10tzXTfznnvC7Y2vseYkzDCOZVZ
|
||||
px6Xpsetlvjtsgh1HXeE18SOmn76Sl5xw47F2aGaC1NYmMFbQO1xiGUws381jLxb
|
||||
F7V6ftxrHzhRWbXl2JOF4KBft5vlUVA13JMnd9x3NlmQyHuDymFPko8VfRp/y7av
|
||||
V88D2/VIC6IurhUZyaPa+MwEynlOHtJivZmcsuTXZee7R17BHfq9kmoodJL9G19y
|
||||
8ViPGm+iVqTghVmPt51VFyauWh9xrbHb/11KpPjO+teiyLHQ2Wy2e/PUKxPZjhLw
|
||||
A57PcCI7fFxXHf/+ZO/zjP+X/xitPqfXb+dbkp7sqrV9tUrRuf2PosbtDLiu4yto
|
||||
EpkNB8KFNrs5VF7xciFoBB//kFIDNUKH5aLwY6fuXMCG+wiJdLKjw6EW2llgKrYI
|
||||
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
|
||||
yalYwuj7Yip5XJGttg==
|
||||
=jLhZ
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
|
6
php.conf
6
php.conf
@ -19,15 +19,13 @@ DirectoryIndex index.php
|
||||
#
|
||||
# Redirect to local php-fpm (no mod_php in default configuration)
|
||||
#
|
||||
<IfModule !mod_php5.c>
|
||||
<IfModule !mod_php7.c>
|
||||
<IfModule !mod_php.c>
|
||||
# Enable http authorization headers
|
||||
SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
|
||||
|
||||
<FilesMatch \.(php|phar)$>
|
||||
SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
|
||||
#
|
||||
@ -36,7 +34,7 @@ DirectoryIndex index.php
|
||||
#
|
||||
# mod_php options
|
||||
#
|
||||
<IfModule mod_php7.c>
|
||||
<IfModule mod_php.c>
|
||||
#
|
||||
# Cause the PHP interpreter to handle files with a .php extension.
|
||||
#
|
||||
|
@ -3,10 +3,11 @@
|
||||
# easy for developers to write dynamically generated webpages.
|
||||
#
|
||||
|
||||
# Cannot load both php5 and php7 modules
|
||||
# Cannot load both php5, php7 and php modules
|
||||
<IfModule !mod_php5.c>
|
||||
<IfModule prefork.c>
|
||||
LoadModule php7_module modules/libphp7.so
|
||||
<IfModule !mod_php7.c>
|
||||
<IfModule prefork.c>
|
||||
LoadModule php_module modules/libphp.so
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
|
||||
|
225
php.spec
225
php.spec
@ -7,8 +7,8 @@
|
||||
#
|
||||
|
||||
# API/ABI check
|
||||
%global apiver 20200930
|
||||
%global zendver 20200930
|
||||
%global apiver 20220829
|
||||
%global zendver 20220829
|
||||
%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.2
|
||||
|
||||
%global mysql_sock %(mysql_config --socket 2>/dev/null || echo /var/lib/mysql/mysql.sock)
|
||||
|
||||
@ -48,6 +48,7 @@
|
||||
%bcond_without pspell
|
||||
%bcond_without tidy
|
||||
%bcond_without db4
|
||||
%bcond_without qdbm
|
||||
%else
|
||||
# Disabled by default on RHEL
|
||||
%bcond_with zts
|
||||
@ -57,12 +58,13 @@
|
||||
%bcond_with pspell
|
||||
%bcond_with tidy
|
||||
%bcond_with db4
|
||||
%bcond_with qdbm
|
||||
%endif
|
||||
%bcond_with modphp
|
||||
%bcond_with imap
|
||||
%bcond_without lmdb
|
||||
|
||||
%global upver 8.0.10
|
||||
%global upver 8.2.3
|
||||
#global rcver RC1
|
||||
|
||||
Summary: PHP scripting language for creating dynamic web sites
|
||||
@ -75,7 +77,8 @@ Release: 1%{?dist}
|
||||
# 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
|
||||
@ -102,27 +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.2.0-parser.patch
|
||||
# use system tzdata
|
||||
Patch42: php-8.0.10-systzdata-v20.patch
|
||||
Patch42: php-8.1.0-systzdata-v22.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
|
||||
Patch47: php-8.1.0-phpinfo.patch
|
||||
|
||||
# Upstream fixes (100+)
|
||||
|
||||
@ -144,12 +140,13 @@ 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
|
||||
BuildRequires: pkgconfig(libedit)
|
||||
BuildRequires: pkgconfig(libpcre2-8) >= 10.30
|
||||
BuildRequires: pkgconfig(libxcrypt)
|
||||
BuildRequires: bzip2
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: autoconf
|
||||
@ -162,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}
|
||||
@ -238,8 +236,8 @@ The php-dbg package contains the interactive PHP debugger.
|
||||
Summary: PHP FastCGI Process Manager
|
||||
BuildRequires: libacl-devel
|
||||
BuildRequires: pkgconfig(libsystemd) >= 209
|
||||
BuildRequires: pkgconfig(libselinux)
|
||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
%{?systemd_requires}
|
||||
# To ensure correct /var/lib/php/session ownership:
|
||||
Requires(pre): httpd-filesystem
|
||||
@ -289,6 +287,7 @@ Provides: php-libxml, php-libxml%{?_isa}
|
||||
Provides: php-openssl, php-openssl%{?_isa}
|
||||
Provides: php-phar, php-phar%{?_isa}
|
||||
Provides: php-pcre, php-pcre%{?_isa}
|
||||
Provides: php-random, php-random%{?_isa}
|
||||
Provides: php-reflection, php-reflection%{?_isa}
|
||||
Provides: php-session, php-session%{?_isa}
|
||||
Provides: php-sockets, php-sockets%{?_isa}
|
||||
@ -314,14 +313,14 @@ 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}
|
||||
Provides: php-zts-devel = %{version}-%{release}
|
||||
Provides: php-zts-devel%{?_isa} = %{version}-%{release}
|
||||
%endif
|
||||
Recommends: php-nikic-php-parser4 >= 4.3.0
|
||||
Recommends: php-nikic-php-parser4 >= 4.15.1
|
||||
|
||||
|
||||
%description devel
|
||||
@ -353,7 +352,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
|
||||
@ -369,7 +368,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)
|
||||
@ -421,7 +420,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
|
||||
@ -585,6 +584,9 @@ BuildRequires: tokyocabinet-devel
|
||||
%if %{with lmdb}
|
||||
BuildRequires: lmdb-devel
|
||||
%endif
|
||||
%if %{with qdbm}
|
||||
BuildRequires: qdbm-devel
|
||||
%endif
|
||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description dba
|
||||
@ -711,16 +713,14 @@ in pure PHP.
|
||||
%patch5 -p1 -b .includedir
|
||||
%patch6 -p1 -b .embed
|
||||
%patch8 -p1 -b .libdb
|
||||
%patch9 -p1 -b .deprecated
|
||||
|
||||
%patch41 -p1 -b .syslib
|
||||
%patch42 -p1 -b .systzdata
|
||||
%patch43 -p1 -b .headers
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
%patch45 -p1 -b .ldap_r
|
||||
%endif
|
||||
%patch47 -p1 -b .phpinfo
|
||||
%patch48 -p1 -b .sha
|
||||
%patch49 -p1 -b .pharsha
|
||||
|
||||
# upstream patches
|
||||
|
||||
@ -733,6 +733,7 @@ in pure PHP.
|
||||
# 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
|
||||
@ -878,6 +879,7 @@ ln -sf ../configure
|
||||
--with-openssl \
|
||||
--with-system-ciphers \
|
||||
--with-external-pcre \
|
||||
--with-external-libcrypt \
|
||||
%ifarch s390 s390x sparc64 sparcv9 riscv64
|
||||
--without-pcre-jit \
|
||||
%endif
|
||||
@ -925,6 +927,9 @@ build --libdir=%{_libdir}/php \
|
||||
--with-tcadb=%{_prefix} \
|
||||
%if %{with lmdb}
|
||||
--with-lmdb=%{_prefix} \
|
||||
%endif
|
||||
%if %{with qdbm}
|
||||
--with-qdbm=%{_prefix} \
|
||||
%endif
|
||||
--enable-exif=shared \
|
||||
--enable-ftp=shared \
|
||||
@ -1012,6 +1017,7 @@ pushd build-fpm
|
||||
build --enable-fpm \
|
||||
--with-fpm-acl \
|
||||
--with-fpm-systemd \
|
||||
--with-fpm-selinux \
|
||||
--libdir=%{_libdir}/php \
|
||||
--without-mysqli \
|
||||
--disable-pdo \
|
||||
@ -1058,6 +1064,9 @@ build --includedir=%{_includedir}/php-zts \
|
||||
--with-tcadb=%{_prefix} \
|
||||
%if %{with lmdb}
|
||||
--with-lmdb=%{_prefix} \
|
||||
%endif
|
||||
%if %{with qdbm}
|
||||
--with-qdbm=%{_prefix} \
|
||||
%endif
|
||||
--with-gettext=shared \
|
||||
--with-iconv=shared \
|
||||
@ -1398,7 +1407,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-*
|
||||
@ -1534,6 +1543,168 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 14 2023 Remi Collet <remi@remirepo.net> - 8.2.3-1
|
||||
- Update to 8.2.3 - http://www.php.net/releases/8_2_3.php
|
||||
|
||||
* Wed Feb 1 2023 Remi Collet <remi@remirepo.net> - 8.2.2-1
|
||||
- Update to 8.2.2 - http://www.php.net/releases/8_2_2.php
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.2~RC1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jan 18 2023 Remi Collet <remi@remirepo.net> - 8.2.2~RC1-1
|
||||
- update to 8.2.2RC1
|
||||
|
||||
* Wed Jan 4 2023 Remi Collet <remi@remirepo.net> - 8.2.1-1
|
||||
- Update to 8.2.1 - http://www.php.net/releases/8_2_1.php
|
||||
|
||||
* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 8.2.1~RC1-3
|
||||
- Rebuild for ICU 72
|
||||
|
||||
* Mon Dec 19 2022 Remi Collet <remi@remirepo.net> - 8.2.1~RC1-2
|
||||
- php-fpm.conf: move include directive after [global] section
|
||||
following upstream example
|
||||
|
||||
* Wed Dec 14 2022 Remi Collet <remi@remirepo.net> - 8.2.1~RC1-1
|
||||
- update to 8.2.1RC1
|
||||
|
||||
* Tue Dec 6 2022 Remi Collet <remi@remirepo.net> - 8.2.0-1
|
||||
- update to 8.2.0 GA
|
||||
|
||||
* Wed Nov 23 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC7-1
|
||||
- update to 8.2.0RC7
|
||||
|
||||
* Tue Nov 8 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC6-1
|
||||
- update to 8.2.0RC6
|
||||
|
||||
* Wed Oct 26 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC5-1
|
||||
- update to 8.2.0RC5
|
||||
|
||||
* Tue Oct 11 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC4-1
|
||||
- update to 8.2.0RC4
|
||||
|
||||
* Wed Sep 28 2022 Remi Collet <remi@remirepo.net> - 8.2.0~RC3-1
|
||||
- update to 8.2.0RC3
|
||||
- bump API/ABI
|
||||
- new random extension
|
||||
- add dependency on libselinux
|
||||
|
||||
* Wed Sep 28 2022 Remi Collet <remi@remirepo.net> - 8.1.11-1
|
||||
- Update to 8.1.11 - http://www.php.net/releases/8_1_11.php
|
||||
|
||||
* Wed Sep 14 2022 Remi Collet <remi@remirepo.net> - 8.1.11~RC1-1
|
||||
- update to 8.1.11RC1
|
||||
|
||||
* Thu Sep 8 2022 Remi Collet <remi@remirepo.net> - 8.1.10-1
|
||||
- Update to 8.1.10 - http://www.php.net/releases/8_1_10.php
|
||||
|
||||
* Wed Aug 17 2022 Remi Collet <remi@remirepo.net> - 8.1.10~RC1-1
|
||||
- update to 8.1.10RC1
|
||||
|
||||
* Tue Aug 2 2022 Remi Collet <remi@remirepo.net> - 8.1.9-1
|
||||
- Update to 8.1.9 - http://www.php.net/releases/8_1_9.php
|
||||
|
||||
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 8.1.9~RC1-3
|
||||
- Rebuilt for ICU 71.1
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.9~RC1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Remi Collet <remi@remirepo.net> - 8.1.9~RC1-1
|
||||
- update to 8.1.9RC1
|
||||
|
||||
* Wed Jul 6 2022 Remi Collet <remi@remirepo.net> - 8.1.8-1
|
||||
- Update to 8.1.8 - http://www.php.net/releases/8_1_8.php
|
||||
|
||||
* Tue Jun 21 2022 Remi Collet <remi@remirepo.net> - 8.1.8~RC1-1
|
||||
- update to 8.1.8RC1
|
||||
|
||||
* Wed Jun 8 2022 Remi Collet <remi@remirepo.net> - 8.1.7-1
|
||||
- Update to 8.1.7 - http://www.php.net/releases/8_1_7.php
|
||||
- add upstream patch to initialize pcre before mbstring
|
||||
|
||||
* Wed May 25 2022 Remi Collet <remi@remirepo.net> - 8.1.7~RC1-1
|
||||
- update to 8.1.7RC1
|
||||
|
||||
* Wed May 11 2022 Remi Collet <remi@remirepo.net> - 8.1.6-1
|
||||
- Update to 8.1.6 - http://www.php.net/releases/8_1_6.php
|
||||
|
||||
* Wed Apr 27 2022 Remi Collet <remi@remirepo.net> - 8.1.6~RC1-1
|
||||
- update to 8.1.6RC1
|
||||
|
||||
* Wed Apr 13 2022 Remi Collet <remi@remirepo.net> - 8.1.5-1
|
||||
- Update to 8.1.5 - http://www.php.net/releases/8_1_5.php
|
||||
|
||||
* Mon Apr 4 2022 Remi Collet <remi@remirepo.net> - 8.1.5~RC1-1
|
||||
- update to 8.1.5RC1
|
||||
|
||||
* Wed Mar 16 2022 Remi Collet <remi@remirepo.net> - 8.1.4-1
|
||||
- Update to 8.1.4 - http://www.php.net/releases/8_1_4.php
|
||||
|
||||
* Thu Mar 3 2022 Remi Collet <remi@remirepo.net> - 8.1.4~RC1-1
|
||||
- update to 8.1.4RC1
|
||||
|
||||
* Wed Feb 23 2022 Remi Collet <remi@remirepo.net> - 8.1.3-2
|
||||
- retrieve tzdata version #2056611
|
||||
|
||||
* Wed Feb 16 2022 Remi Collet <remi@remirepo.net> - 8.1.3-1
|
||||
- Update to 8.1.3 - http://www.php.net/releases/8_1_3.php
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Remi Collet <remi@remirepo.net> - 8.1.2-1
|
||||
- Update to 8.1.2 - http://www.php.net/releases/8_1_2.php
|
||||
|
||||
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 8.1.2~RC1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
|
||||
|
||||
* Wed Jan 5 2022 Remi Collet <remi@remirepo.net> - 8.1.2~RC1-1
|
||||
- update to 8.1.2RC1
|
||||
|
||||
* Wed Dec 15 2021 Remi Collet <remi@remirepo.net> - 8.1.1-1
|
||||
- Update to 8.1.1 - http://www.php.net/releases/8_1_1.php
|
||||
|
||||
* Thu Dec 2 2021 Remi Collet <remi@remirepo.net> - 8.1.1~RC1-1
|
||||
- update to 8.1.1RC1
|
||||
|
||||
* Wed Nov 24 2021 Remi Collet <remi@remirepo.net> - 8.1.0-1
|
||||
- update to 8.1.0 GA
|
||||
|
||||
* Wed Nov 10 2021 Remi Collet <remi@remirepo.net> - 8.1.0~RC6-1
|
||||
- update to 8.1.0RC6
|
||||
|
||||
* 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
|
||||
|
||||
* Tue Oct 19 2021 Remi Collet <remi@remirepo.net> - 8.0.12-1
|
||||
- Update to 8.0.12 - http://www.php.net/releases/8_0_12.php
|
||||
|
||||
* Mon Oct 18 2021 Remi Collet <remi@remirepo.net> - 8.0.12~RC1-2
|
||||
- build using system libxcrypt
|
||||
|
||||
* Wed Oct 6 2021 Remi Collet <remi@remirepo.net> - 8.0.12~RC1-1
|
||||
- update to 8.0.12RC1
|
||||
|
||||
* Wed Sep 22 2021 Remi Collet <remi@remirepo.net> - 8.0.11-1
|
||||
- Update to 8.0.11 - http://www.php.net/releases/8_0_11.php
|
||||
|
||||
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 8.0.11~RC1-4
|
||||
- Rebuilt with OpenSSL 3.0.0
|
||||
|
||||
* Mon Sep 13 2021 Remi Collet <remi@remirepo.net> - 8.0.11~RC1-3
|
||||
- more changes for OpenSSL 3 from PHP 8.1
|
||||
|
||||
* Fri Sep 10 2021 Remi Collet <remi@remirepo.net> - 8.0.11~RC1-2
|
||||
- backport changes for OpenSSL 3 from PHP 8.1
|
||||
|
||||
* Tue Sep 7 2021 Remi Collet <remi@remirepo.net> - 8.0.11~RC1-1
|
||||
- update to 8.0.11RC1
|
||||
|
||||
* Thu Aug 26 2021 Remi Collet <remi@remirepo.net> - 8.0.10-1
|
||||
- Update to 8.0.10 - http://www.php.net/releases/8_0_10.php
|
||||
|
||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (php-8.0.10.tar.xz) = 25f23822a45eab837645a0259c7dbb999766506de35c1bba53e928e2b5935ba70278b931d5085966178e08013ec69407fc68eb041b3ae2e619b81f20ec8ce736
|
||||
SHA512 (php-8.0.10.tar.xz.asc) = 99254f2183d520ac8522034b5c47519b3193f5f3cac4d3ebd2ba14fed4e6f5b9f247bcf5e28e36a43287e86bc7815eb0a0886d398fa9cfba9596f43d8453ede2
|
||||
SHA512 (php-8.2.3.tar.xz) = 4e3ae840ac486868d5bedc2ae771e3ff5d4939ba4c2f7c769b7052322a5eccc8fba253df311a77f3ea852bf42f9dec34653baf828f68c9c191d3a425a8968d4c
|
||||
SHA512 (php-8.2.3.tar.xz.asc) = f152a76a428602589e142a0007b73810ece57af9c1455571efd9cd215f97273671b87831b4f9f6396ee156ae3b0c22c06b48dda582acf9e6028fa7a627a4501e
|
||||
|
Loading…
Reference in New Issue
Block a user