Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

php8.changes Changed

@@ -1,4 +1,159 @@
 -------------------------------------------------------------------
+Mon Aug  7 10:04:45 UTC 2023 - Angelo Grossini <rottame@intercom.it>
+
+- merge conflicts
+- build imap only in main flavor
+
+-------------------------------------------------------------------
+Mon Jul 17 08:18:25 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.21
+- modified patches
+  % php-sort-filelist-phar.patch (refreshed)
+
+-------------------------------------------------------------------
+Tue May 30 16:59:37 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.20
+  * This is a security release.
+  * https://www.php.net/ChangeLog-8.php#8.1.20
+- force to repack tarball after update
+  https://github.com/php/php-src/issues/11300
+- session.save_path set to /var/lib/php8/sessions in mod_php8.conf
+  and www.conf php-fpm pool example
+- modified sources
+  % mod_php8.conf
+- added sources
+  + repack.sh
+  + php-unicode-allow-redistribution.patch
+
+-------------------------------------------------------------------
+Thu May 25 06:56:48 UTC 2023 - pgajdos@suse.com
+
+- repack the tarball temporarily bsc#1211648
+
+-------------------------------------------------------------------
+Tue May 23 12:39:00 UTC 2023 - pgajdos@suse.com
+
+- also MIT license (systzdata patch, ext/date/lib/parse_posix.c)
+  https://build.suse.de/request/show/298230
+
+-------------------------------------------------------------------
+Fri May 12 10:28:10 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.19
+  * This is a bug fix release.
+  * https://www.php.net/ChangeLog-8.php#8.1.19
+- modified patches
+  % php-ar-flags.patch (refreshed)
+  % php-build-reproducible-phar.patch (refreshed)
+  % php-ini.patch (refreshed)
+  % php-systzdata-v23.patch (refreshed)
+
+-------------------------------------------------------------------
+Wed May 10 06:40:59 UTC 2023 - pgajdos@suse.com
+
+- downgrade back to 8.1.18
+  https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/4ADCEV2FII7J5FZEWREFETTEVX7CDUSR/
+
+-------------------------------------------------------------------
+Thu May  4 08:16:37 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.2.5
+  * Readonly classes
+  * Disjunctive Normal Form (DNF) Types
+  * Allow null, false, and true as stand-alone types
+  * New "Random" extension
+  * Constants in traits
+  * Deprecate dynamic properties
+  * for details, see
+    https://www.php.net/releases/8.2/en.php
+    https://www.php.net/manual/en/migration82.php
+- modified patches
+  % php-ar-flags.patch (refreshed)
+  % php-build-reproducible-phar.patch (refreshed)
+  % php-ini.patch (refreshed)
+- deleted patches
+  - php-crypt-tests.patch (not needed)
+- modified sources
+  % php8.keyring
+
+-------------------------------------------------------------------
+Thu Apr 20 21:19:59 UTC 2023 - Arjen de Korte <suse+build@de-korte.org>
+
+- The %_restart_on_update macro was removed from systemd-rpm-macros.
+  Remove %posttrans for FPM as it wasn't working as intended anyway.
+  boo#1210576
+
+-------------------------------------------------------------------
+Fri Apr 14 06:06:55 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.18
+  * This is a bug fix release.
+  https://www.php.net/ChangeLog-8.php#8.1.18
+- modified patches
+  % php-ar-flags.patch (refreshed)
+  % php-build-reproducible-phar.patch (refreshed)
+  % php-ini.patch (refreshed)
+
+-------------------------------------------------------------------
+Thu Mar 16 12:45:14 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.17
+  * This is a bug fix release.
+  https://www.php.net/ChangeLog-8.php#8.1.17
+
+-------------------------------------------------------------------
+Tue Mar 14 09:50:55 UTC 2023 - pgajdos@suse.com
+
+- update to newest systzdata patch bsc#1208199
+- deleted patches
+  - php-systzdata-v21.patch (upstreamed)
+- added patches
+  fix use of the system timezone database
+  + php-systzdata-v23.patch
+
+-------------------------------------------------------------------
+Sun Mar  5 09:54:13 UTC 2023 - Aeneas Jaißle <aj@ajaissle.de>
+
+- add "/usr/share/php" to include_path
+
+-------------------------------------------------------------------
+Fri Mar  3 13:56:09 UTC 2023 - pgajdos@suse.com
+
+- allow to specify load order of extensions in %{php_sysconf}/conf.d
+  bsc#1205162
+
+-------------------------------------------------------------------
+Sat Feb 25 20:36:50 UTC 2023 - Arjen de Korte <suse+build@de-korte.org>
+
+- change to %bcond conditional build dependencies
+
+-------------------------------------------------------------------
+Thu Feb 16 09:00:52 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.16
+  * This is a security release that addresses CVE-2023-0567,
+    CVE-2023-0568, and CVE-2023-0662.
+    (bsc#1208366, bsc#1208367, bsc#1208388)
+  * https://www.php.net/ChangeLog-8.php#8.1.16
+
+-------------------------------------------------------------------
+Fri Feb  3 15:04:35 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.15
+  * This is a bug fix release.
+  * https://www.php.net/ChangeLog-8.php#8.1.15
+
+-------------------------------------------------------------------
+Fri Jan  6 09:40:33 UTC 2023 - pgajdos@suse.com
+
+- version update to 8.1.14
+  * This is a security release.
+  * fixed: CVE-2022-31631 bsc#1206958
+  * https://www.php.net/ChangeLog-8.php#8.1.14
+
+-------------------------------------------------------------------
 Tue Mar  7 14:13:46 UTC 2023 - Angelo Grossini <rottame@intercom.it>
 
 - enable imap extension
@@ -216,7 +371,7 @@
 -------------------------------------------------------------------
 Wed Aug  4 01:36:39 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 
-- fix apparmor support: seems it requires a configure flag now. 
+- fix apparmor support: seems it requires a configure flag now.
 
 -------------------------------------------------------------------
 Thu Jul 29 16:42:04 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
@@ -310,7 +465,7 @@
 Fri Jan 15 09:02:57 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
 
 - deleted patch (redundant cast, both sides are already signed int)
-  - php-odbc-cmp-int-cast.patch 
+  - php-odbc-cmp-int-cast.patch
 
 -------------------------------------------------------------------
 Wed Jan 13 20:04:12 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
@@ -496,7 +651,7 @@
 
 - updated to 7.4.9: This is a security release which also contains
   several bug fixes. See https://www.php.net/ChangeLog-7.php#7.4.9
-  
+
 -------------------------------------------------------------------
 Thu Jul  9 14:09:09 UTC 2020 - Arjen de Korte <suse+build@de-korte.org>
 
@@ -659,7 +814,7 @@
   % php-systemd-unit.patch
   % php7.keyring (use keys of the PHP-7.4 release managers)
   % php7.rpmlintrc
-  
+
 -------------------------------------------------------------------
 Tue Nov 19 09:50:52 UTC 2019 - pgajdos@suse.com
 
@@ -729,7 +884,7 @@
 
 - updated to 7.3.9: This is a security release which also contains
   several bug fixes. See https://www.php.net/ChangeLog-7.php#7.3.9

php8.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,25 +40,28 @@
 %define psuffix %{nil}
 %endif
 
-%global php_vhng_branch          8.1
-
-%define debug_build       0
-%define asan_build        0
+%global php_vhng_branch   8.1
 %global apiver            20210902
 %global zendver           20210902
 %define extension_dir     %{_libdir}/%{php_name}/extensions
 %define php_sysconf       %{_sysconfdir}/%{php_name}
-%define build_firebird 0
-%define build_sodium 1
-%define build_argon2 0
+
+%bcond_without	apparmor
 %if 0%{?suse_version} >= 1500
-%define build_argon2 1
+%bcond_without	argon2
+%else
+%bcond_with	argon2
 %endif
+%bcond_with	asan
+%bcond_with	debug
+%bcond_with	firebird
+%bcond_without	sodium
+
 Name:           %{pprefix}%{php_name}%{psuffix}
-Version:        8.1.13
+Version:        8.1.21
 Release:        0
 Summary:        Interpreter for the PHP scripting language version 8
-License:        PHP-3.01
+License:        MIT AND PHP-3.01
 Group:          Development/Libraries/PHP
 URL:            https://secure.php.net
 Source0:        https://secure.php.net/distributions/php-%{version}.tar.xz
@@ -66,7 +69,10 @@
 Source2:        %{php_name}-fpm.conf
 Source5:        README.macros
 Source6:        macros.php
-Source8:        https://secure.php.net/distributions/php-%{version}.tar.xz.asc
+# temporarily repacked tarball https://github.com/php/php-src/issues/11300
+#Source8:        https://secure.php.net/distributions/php-%{version}.tar.xz.asc
+Source7:        repack.sh
+Source8:        php-unicode-allow-redistribution.patch
 #Source9:       https://www.php.net/distributions/php-keyring.gpg#/%%{php_name}.keyring
 Source9:        %{php_name}.keyring
 Source11:       %{php_name}.rpmlintrc
@@ -82,18 +88,12 @@
 # SUSE specific ini defaults
 Patch3:         php-ini.patch
 # use of the system timezone database
-Patch4:         php-systzdata-v21.patch
+Patch4:         php-systzdata-v23.patch
 # adjust upstream systemd unit to SUSE needs
 Patch5:         php-systemd-unit.patch
 # PATCH-FEATURE-OPENSUSE use ordered input files for reproducible /usr/bin/phar.phar
 Patch6:         php-sort-filelist-phar.patch
 ## Bugfix patches
-# following patch is to fix configure tests for crypt; the aim is to have php
-# built against glibc's crypt; problem is, that our glibc doesn't support extended
-# DES, so as soon as upstream fixes this, don't forgot to remove extended DES
-# from their checking as I indicated in crypt-tests.patch yet, or php will
-# silently use his own implementation again
-Patch20:        php-crypt-tests.patch
 # should be upstreamed, will do later
 Patch22:        php-date-regenerate-lexers.patch
 # PATCH-FEATURE-UPSTREAM https://github.com/php/php-src/pull/6564
@@ -109,7 +109,6 @@
 BuildRequires:  gpg2
 BuildRequires:  imap-devel
 BuildRequires:  libacl-devel
-BuildRequires:  libapparmor-devel
 BuildRequires:  libbz2-devel
 BuildRequires:  libtidy-devel
 BuildRequires:  libtiff-devel
@@ -149,15 +148,18 @@
 BuildRequires:  pkgconfig(openssl) >= 1.0.2
 BuildRequires:  pkgconfig(sqlite3) >= 3.7.7
 BuildRequires:  pkgconfig(zlib) >= 1.2.0.4
-%if %{build_firebird}
+%if %{with apparmor}
+BuildRequires:  pkgconfig(libapparmor)
+%endif
+%if %{with firebird}
 # firebird-devel was merged into libfbclient2-devel for firebird 3
 BuildRequires:  firebird-devel
 BuildRequires:  libfbclient2-devel
 %endif
-%if %{build_sodium}
+%if %{with sodium}
 BuildRequires:  pkgconfig(libsodium) >= 1.0.8
 %endif
-%if %{build_argon2}
+%if %{with argon2}
 BuildRequires:  pkgconfig(libargon2)
 %endif
 %if "%{flavor}" == "test"
@@ -347,6 +349,7 @@
 Requires(post): %{_sbindir}/a2enmod
 Supplements:    (php-fpm and apache2)
 Conflicts:      mod_php_any
+BuildArch:      noarch
 
 %description apache
 Configuration for Apache to pass all requests for PHP scripts to the
@@ -622,7 +625,7 @@
 %description mysql
 PHP functions for access to MySQL database servers.
 
-%if %{build_firebird}
+%if %{with firebird}
 %package firebird
 Summary:        Firebird database client for PHP
 Group:          Development/Libraries/PHP
@@ -811,7 +814,7 @@
 communication functions based on the BSD sockets API, providing the
 possibility to act as a socket server as well as a client.
 
-%if %{build_sodium}
+%if %{with sodium}
 %package sodium
 Summary:        Cryptographic Extension Based on Libsodium
 Group:          Development/Libraries/PHP
@@ -965,7 +968,6 @@
 compressed files, through versions of most of the filesystem
 functions which work with gzip-compressed files (and uncompressed
 files, too, but not with sockets).
-%endif
 
 %package imap
 Summary:        IMAP protocol support for PHP
@@ -974,6 +976,8 @@
 Provides:       php-imap = %{version}
 Obsoletes:      php5-imap
 
+%endif
+
 %description imap
 These functions enable you to operate with the IMAP protocol, as well
 as the NNTP, POP3 and local mailbox access methods.
@@ -1006,18 +1010,31 @@
     exit 1
 fi
 
+if grep -r 'specifically excludes the right'; then
+  echo
+  echo "https://github.com/php/php-src/issues/11300"
+  echo "please run repack.sh"
+  exit 1
+fi
+
 %build
+%if 150000 <= 0%{?sle_version} && 0%{?sle_version} <= 150200
+# former libcrypt does not support extended DES, so the build would fail
+# with --with-external-libcrypt
+sed -i 's:|| test "$ac_cv_crypt_ext_des" = "no"::' ext/standard/config.m4
+%endif
+
 # regenerate configure etc.
 ./buildconf --force
 
 # export flags
 CFLAGS="%{optflags} -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
 CXXFLAGS="%{optflags} -O3 -fPIE -fPIC -DPIC -D_GNU_SOURCE -fno-strict-aliasing"
-%if %{build_firebird}
+%if %{with firebird}
 CFLAGS="$CFLAGS -I/usr/include/firebird"
 CXXFLAGS="$CXXFLAGS -I/usr/include/firebird"
 %endif
-%if %{debug_build}
+%if %{with debug}
 CFLAGS="$CFLAGS -Og"
 CXXFLAGS="$CXXFLAGS -Og"
 %endif
@@ -1061,9 +1078,10 @@
         --with-gnu-ld \
         --enable-re2c-cgoto \
         --with-system-tzdata=%{_datadir}/zoneinfo \
+        --with-external-libcrypt \
         --with-mhash \
         --disable-phpdbg \
-%if %{build_argon2}
+%if %{with argon2}
         --with-password-argon2=%{_usr} \
 %endif
         "$@" || { cat config.log; exit 1; }
@@ -1083,7 +1101,7 @@

php-ar-flags.patch Changed

php-build-reproducible-phar.patch Changed

@@ -16,11 +16,11 @@
  ext/phar/zip.c           |  2 +-
  6 files changed, 18 insertions(+), 5 deletions(-)
 
-Index: php-8.0.0/ext/phar/phar.c
+Index: php-8.1.19/ext/phar/phar.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/phar.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/phar.c	2021-01-07 10:56:10.978719743 +0100
-@@ -2995,7 +2995,7 @@ int phar_flush(phar_archive_data *phar,
+--- php-8.1.19.orig/ext/phar/phar.c
++++ php-8.1.19/ext/phar/phar.c
+@@ -3004,7 +3004,7 @@ int phar_flush(phar_archive_data *phar,
  			4: metadata-len
  			+: metadata
  		*/
@@ -29,10 +29,10 @@
  		phar_set_32(entry_buffer, entry->uncompressed_filesize);
  		phar_set_32(entry_buffer+4, mytime);
  		phar_set_32(entry_buffer+8, entry->compressed_filesize);
-Index: php-8.0.0/ext/phar/phar_internal.h
+Index: php-8.1.19/ext/phar/phar_internal.h
 ===================================================================
---- php-8.0.0.orig/ext/phar/phar_internal.h	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/phar_internal.h	2021-01-07 10:56:10.978719743 +0100
+--- php-8.1.19.orig/ext/phar/phar_internal.h
++++ php-8.1.19/ext/phar/phar_internal.h
 @@ -427,6 +427,21 @@ static inline enum phar_fp_type phar_get
  	return PHAR_G(cached_fp)entry->phar->phar_pos.manifestentry->manifest_pos.fp_type;
  }
@@ -55,10 +55,10 @@
  static inline zend_off_t phar_get_fp_offset(phar_entry_info *entry)
  {
  	if (!entry->is_persistent) {
-Index: php-8.0.0/ext/phar/stream.c
+Index: php-8.1.19/ext/phar/stream.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/stream.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/stream.c	2021-01-07 10:56:10.978719743 +0100
+--- php-8.1.19.orig/ext/phar/stream.c
++++ php-8.1.19/ext/phar/stream.c
 @@ -463,7 +463,7 @@ static int phar_stream_flush(php_stream
  	phar_entry_data *data = (phar_entry_data *) stream->abstract;
  
@@ -68,11 +68,11 @@
  		ret = phar_flush(data->phar, 0, 0, 0, &error);
  		if (error) {
  			php_stream_wrapper_log_error(stream->wrapper, REPORT_ERRORS, "%s", error);
-Index: php-8.0.0/ext/phar/tar.c
+Index: php-8.1.19/ext/phar/tar.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/tar.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/tar.c	2021-01-07 10:56:10.978719743 +0100
-@@ -971,7 +971,7 @@ int phar_tar_flush(phar_archive_data *ph
+--- php-8.1.19.orig/ext/phar/tar.c
++++ php-8.1.19/ext/phar/tar.c
+@@ -972,7 +972,7 @@ int phar_tar_flush(phar_archive_data *ph
  	char halt_stub = "__HALT_COMPILER();";
  
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;
@@ -81,10 +81,10 @@
  	entry.is_modified = 1;
  	entry.is_crc_checked = 1;
  	entry.is_tar = 1;
-Index: php-8.0.0/ext/phar/util.c
+Index: php-8.1.19/ext/phar/util.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/util.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/util.c	2021-01-07 10:56:10.982719768 +0100
+--- php-8.1.19.orig/ext/phar/util.c
++++ php-8.1.19/ext/phar/util.c
 @@ -574,7 +574,7 @@ phar_entry_data *phar_get_or_create_entr
  
  	phar_add_virtual_dirs(phar, path, path_len);
@@ -94,11 +94,11 @@
  	etemp.is_crc_checked = 1;
  	etemp.phar = phar;
  	etemp.filename = estrndup(path, path_len);
-Index: php-8.0.0/ext/phar/zip.c
+Index: php-8.1.19/ext/phar/zip.c
 ===================================================================
---- php-8.0.0.orig/ext/phar/zip.c	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/ext/phar/zip.c	2021-01-07 10:56:10.982719768 +0100
-@@ -1214,7 +1214,7 @@ int phar_zip_flush(phar_archive_data *ph
+--- php-8.1.19.orig/ext/phar/zip.c
++++ php-8.1.19/ext/phar/zip.c
+@@ -1215,7 +1215,7 @@ int phar_zip_flush(phar_archive_data *ph
  
  	pass.error = &temperr;
  	entry.flags = PHAR_ENT_PERM_DEF_FILE;

php-crypt-tests.patch Deleted

@@ -1,13 +0,0 @@
-Index: php-8.0.0RC4/ext/standard/config.m4
-===================================================================
---- php-8.0.0RC4.orig/ext/standard/config.m4	2020-11-10 11:57:27.000000000 +0100
-+++ php-8.0.0RC4/ext/standard/config.m4	2020-11-15 09:13:55.955213068 +0100
-@@ -278,7 +278,7 @@ dnl
- dnl If one of them is missing, use our own implementation, portable code is then possible
- dnl
- 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 "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_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"; 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)
-

php-ini.patch Changed

@@ -1,8 +1,8 @@
-Index: php-8.0.0/php.ini-production
+Index: php-8.1.19/php.ini-production
 ===================================================================
---- php-8.0.0.orig/php.ini-production	2020-11-24 18:04:03.000000000 +0100
-+++ php-8.0.0/php.ini-production	2021-01-07 10:13:37.934622775 +0100
-@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+--- php-8.1.19.orig/php.ini-production
++++ php-8.1.19/php.ini-production
+@@ -742,7 +742,7 @@ default_charset = "UTF-8"
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -11,7 +11,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -965,7 +965,7 @@ cli_server.color = On
+@@ -975,7 +975,7 @@ cli_server.color = On
  Date
  ; Defines the default timezone used by the date functions
  ; https://php.net/date.timezone
@@ -20,7 +20,7 @@
  
  ; https://php.net/date.default-latitude
  ;date.default_latitude = 31.7667
-@@ -1154,7 +1154,7 @@ mysqli.max_persistent = -1
+@@ -1164,7 +1164,7 @@ mysqli.max_persistent = -1
  
  ; Allow or prevent persistent links.
  ; https://php.net/mysqli.allow-persistent
@@ -29,3 +29,16 @@
  
  ; Maximum number of links.  -1 means no limit.
  ; https://php.net/mysqli.max-links
+Index: php-8.1.19/sapi/fpm/www.conf.in
+===================================================================
+--- php-8.1.19.orig/sapi/fpm/www.conf.in
++++ php-8.1.19/sapi/fpm/www.conf.in
+@@ -27,6 +27,8 @@
+ ;                 If the group is not set, the user's group is used.
+ user = @php_fpm_user@
+ group = @php_fpm_group@
++; session folder has to be writable by user:group
++php_valuesession.save_path = /var/lib/php8/sessions
+ 
+ ; The address on which to accept FastCGI requests.
+ ; Valid syntaxes are:

php-sort-filelist-phar.patch Changed

@@ -1,12 +1,13 @@
-diff -purN php-7.4.14RC1-orig/ext/phar/Makefile.frag php-7.4.14RC1/ext/phar/Makefile.frag
---- php-7.4.14RC1-orig/ext/phar/Makefile.frag	2020-12-15 17:07:01.000000000 +0100
-+++ php-7.4.14RC1/ext/phar/Makefile.frag	2021-01-03 10:57:09.681917866 +0100
-@@ -37,7 +37,7 @@ $(builddir)/phar.phar: $(builddir)/phar.
- 	-@echo "Generating phar.phar"
- 	-@rm -f $(builddir)/phar.phar
- 	-@rm -f $(srcdir)/phar.phar
--	@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/
-+	@$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)" -l 9  $(srcdir)/phar/*.inc
- 	-@chmod +x $(builddir)/phar.phar
- 
- install-pharcmd: pharcmd
+Index: php-8.1.21/ext/phar/Makefile.frag
+===================================================================
+--- php-8.1.21.orig/ext/phar/Makefile.frag
++++ php-8.1.21/ext/phar/Makefile.frag
+@@ -46,7 +46,7 @@ $(builddir)/phar.phar: $(builddir)/phar.
+ 	if  "$(TEST_PHP_EXECUTABLE_RES)" != 1 ; then \
+ 		rm -f $(builddir)/phar.phar; \
+ 		rm -f $(srcdir)/phar.phar; \
+-		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  $(srcdir)/phar/; \
++		$(PHP_PHARCMD_EXECUTABLE) $(PHP_PHARCMD_SETTINGS) $(builddir)/phar.php pack -f $(builddir)/phar.phar -a pharcommand -c auto -x \\.svn -p 0 -s $(srcdir)/phar/phar.php -h sha1 -b "$(PHP_PHARCMD_BANG)"  -l 9  $(srcdir)/phar/*.inc; \
+ 		chmod +x $(builddir)/phar.phar; \
+ 	else \
+ 		echo "Skipping phar.phar generating during cross compilation"; \

php-systzdata-v21.patch -> php-systzdata-v23.patch Changed

@@ -5,6 +5,8 @@
 than embedding a copy.  Discussed upstream but was not desired.
 
 History:
+r23: fix possible buffer overflow
+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)
@@ -32,9 +34,10 @@
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
-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
+Index: php-8.1.19/ext/date/config0.m4
+===================================================================
+--- php-8.1.19.orig/ext/date/config0.m4
++++ php-8.1.19/ext/date/config0.m4
 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS(io.h)
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
@@ -55,9 +58,10 @@
  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 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
+Index: php-8.1.19/ext/date/lib/parse_tz.c
+===================================================================
+--- php-8.1.19.orig/ext/date/lib/parse_tz.c
++++ php-8.1.19/ext/date/lib/parse_tz.c
 @@ -26,9 +26,22 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -93,7 +97,7 @@
  	/* read ID */
  	version = (*tzf)3 - '0';
  	*tzf += 4;
-@@ -577,7 +595,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -577,7 +595,467 @@ void timelib_dump_tzinfo(timelib_tzinfo
  	}
  }
  
@@ -161,7 +165,7 @@
 +
 +    /* Annoying encoding used by zone.tab has no decimal point, so use
 +     * the length to determine the format:
-+     * 
++     *
 +     * 4 = DDMM
 +     * 5 = DDDMM
 +     * 6 = DDMMSS
@@ -228,10 +232,10 @@
 +
 +        if (*p == '#' || *p == '\0' || *p == '\n')
 +            continue;
-+        
++
 +        if (!isalpha(p0) || !isalpha(p1) || p2 != '\t')
 +            continue;
-+        
++
 +        /* code => AA */
 +        code = p;
 +        p2 = 0;
@@ -265,7 +269,7 @@
 +
 +        if (*p == '\n' || *p == '\t')
 +            *p = '\0';
-+        
++
 +        hash = tz_hash(name);
 +        i = malloc(sizeof *i);
 +        memcpy(i->code, code, 2);
@@ -285,7 +289,7 @@
 +
 +/* Return location info from hash table, using given timezone name.
 + * Returns NULL if the name could not be found. */
-+const struct location_info *find_zone_info(struct location_info **li, 
++const struct location_info *find_zone_info(struct location_info **li,
 +                                           const char *name)
 +{
 +    uint32_t hash = tz_hash(name);
@@ -301,7 +305,7 @@
 +    }
 +
 +    return NULL;
-+}    
++}
 +
 +/* Filter out some non-tzdata files and the posix/right databases, if
 + * present. */
@@ -323,6 +327,44 @@
 +        return timelib_strcasecmp(alpha->id, beta->id);
 +}
 +
++/* Retrieve tzdata version. */
++static void retrieve_zone_version(timelib_tzdb *db)
++{
++    static char buf30;
++    char pathPATH_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(buf10) &&
++				isdigit(buf11) &&
++				isdigit(buf12) &&
++				isdigit(buf13) &&
++				islower(buf14)) {
++				if (buf14 >= 't') {        /* 2022t = 2022.20 */
++					buf17 = 0;
++					buf16 = buf14 - 't' + '0';
++					buf15 = '2';
++				} else if (buf14 >= 'j') { /* 2022j = 2022.10 */
++					buf17 = 0;
++					buf16 = buf14 - 'j' + '0';
++					buf15 = '1';
++				} else {                     /* 2022a = 2022.1  */
++					buf16 = 0;
++					buf15 = buf14 - 'a' + '1';
++				}
++				buf14 = '.';
++				db->version = buf+10;
++			}
++		}
++		fclose(fp);
++    }
++}
++
 +
 +/* Create the zone identifier index by trawling the filesystem. */
 +static void create_zone_index(timelib_tzdb *db)
@@ -338,7 +380,7 @@
 +	dirstack = malloc(dirstack_size * sizeof *dirstack);
 +	dirstack_top = 1;
 +	dirstack0 = strdup("");
-+	
++
 +	/* Index array. */
 +	index_size = 64;
 +	db_index = malloc(index_size * sizeof *db_index);
@@ -359,22 +401,22 @@
 +			struct stat st;
 +			const char *leaf = entscount - 1->d_name;
 +
-+			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", 
++			snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
 +				 top, leaf);
-+			
++
 +			if (strlen(name) && stat(name, &st) == 0) {
 +				/* Name, relative to the zoneinfo prefix. */
 +				const char *root = top;
 +
 +				if (root0 == '/') root++;
 +
-+				snprintf(name, sizeof name, "%s%s%s", root, 
++				snprintf(name, sizeof name, "%s%s%s", root,
 +					 *root ? "/": "", leaf);
 +
 +				if (S_ISDIR(st.st_mode)) {
 +					if (dirstack_top == dirstack_size) {
 +						dirstack_size *= 2;
-+						dirstack = realloc(dirstack, 
++						dirstack = realloc(dirstack,
 +								   dirstack_size * sizeof *dirstack);
 +					}
 +					dirstackdirstack_top++ = strdup(name);
@@ -392,7 +434,7 @@
 +
 +			free(ents--count);
 +		}
-+		
++
 +		if (count != -1) free(ents);
 +		free(top);
 +	} while (dirstack_top);
@@ -414,8 +456,8 @@
 +{
 +        size_t n;
 +        char *data, *p;
-+        
-+        data = malloc(3 * sysdb->index_size + 7);
++
++        data = malloc(3 * sysdb->index_size + sizeof(FAKE_HEADER) - 1);
 +
 +        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
 +
@@ -447,7 +489,7 @@
 +                        ent->pos = 0;
 +                }
 +        }

php-unicode-allow-redistribution.patch Added

@@ -0,0 +1,600 @@
+diff --git a/ext/mbstring/tests/data/BIG5.txt b/ext/mbstring/tests/data/BIG5.txt
+index dd6cd9ec2283..652203e2ba08 100644
+--- a/ext/mbstring/tests/data/BIG5.txt
++++ b/ext/mbstring/tests/data/BIG5.txt
+@@ -1,35 +1,26 @@
++# BIG5.TXT
++# Date: 2015-12-02 23:52:00 GMT KW
++# © 2015 Unicode®, Inc.
++# For terms of use, see http://www.unicode.org/terms_of_use.html
+ #
+ #	Name:             BIG5 to Unicode table (complete)
+ #	Unicode version:  1.1
+-#	Table version:    0.0d3
++#	Table version:    2.0
+ #	Table format:     Format A
+-#	Date:             11 February 1994
+-#	Authors:          Glenn Adams <glenn@metis.com>
+-#                     John H. Jenkins <John_Jenkins@taligent.com>
+-#
+-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
+-#
+-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
+-#	No claims are made as to fitness for any particular purpose.  No
+-#	warranties of any kind are expressed or implied.  The recipient
+-#	agrees to determine applicability of information provided.  If this
+-#	file has been provided on magnetic media by Unicode, Inc., the sole
+-#	remedy for any claim will be exchange of defective media within 90
+-#	days of receipt.
+-#
+-#	Recipient is granted the right to make copies in any form for
+-#	internal distribution and to freely use the information supplied
+-#	in the creation of products supporting Unicode.  Unicode, Inc.
+-#	specifically excludes the right to re-distribute this file directly
+-#	to third parties or other organizations whether for profit or not.
++#	Date:             2011 October 14 (header updated: 2015 December 02)
+ #
+ #	General notes:
+ #
+-#	This table contains the data Metis and Taligent currently have on how
+-#       BIG5 characters map into Unicode.
++#
++# This table contains one set of mappings from BIG5 into Unicode.
++# Note that these data are *possible* mappings only and may not be the
++# same as those used by actual products, nor may they be the best suited
++# for all uses.  For more information on the mappings between various code
++# pages incorporating the repertoire of BIG5 and Unicode, consult the
++# VENDORS mapping data.
+ #
+ #	WARNING!  It is currently impossible to provide round-trip compatibility
+-#		between BIG5 and Unicode.
++#		between BIG5 and Unicode.  
+ #
+ #	A number of characters are not currently mapped because
+ #		of conflicts with other mappings.  They are as follows:
+@@ -46,173 +37,57 @@
+ #
+ #	We currently map all of these characters to U+FFFD REPLACEMENT CHARACTER.
+ #		It is also possible to map these characters to their duplicates, or to
+-#		the user zone.
+-#
++#		the user zone.  
++#	
+ #	Notes:
+ #
+ #	1. In addition to the above, there is some uncertainty about the
+ #       mappings in the range C6A1 - C8FE, and F9DD - F9FE.  The ETEN
+-#		version of BIG5 organizes the former range differently, and adds
+-#		additional characters in the latter range.  The correct mappings
+-#		these ranges need to be determined.
++#	version of BIG5 organizes the former range differently, and adds
++#	additional characters in the latter range.  The correct mappings
++#	these ranges need to be determined.
+ #
+ #	2.  There is an uncertainty in the mapping of the Big Five character
+-#		0xA3BC.  This character occurs within the Big Five block of tone marks
+-#		for bopomofo and is intended to be the tone mark for the first tone in
+-#		Mandarin Chinese.  We have selected the mapping U+02C9 MODIFIER LETTER
+-#		MACRON (Mandarin Chinese first tone) to reflect this semantic.
+-#		However, because bopomofo uses the absense of a tone mark to indicate
+-#		the first Mandarin tone, most implementations of Big Five represent
+-#		this character with a blank space, and so a mapping such as U+2003 EM SPACE
+-#		might be preferred.
+-#
+-#
++#	0xA3BC.  This character occurs within the Big Five block of tone marks
++#	for bopomofo and is intended to be the tone mark for the first tone in
++#	Mandarin Chinese.  We have selected the mapping U+02C9 MODIFIER LETTER
++#	MACRON (Mandarin Chinese first tone) to reflect this semantic.  
++#	However, because bopomofo uses the absense of a tone mark to indicate
++#	the first Mandarin tone, most implementations of Big Five represent
++#	this character with a blank space, and so a mapping such as U+2003 EM
++#	SPACE might be preferred.  
+ #
+ #	Format:  Three tab-separated columns
+ #		 Column #1 is the BIG5 code (in hex as 0xXXXX)
+ #		 Column #2 is the Unicode (in hex as 0xXXXX)
+ #		 Column #3  is the Unicode name (follows a comment sign, '#')
+-#					The official names for Unicode characters U+4E00
+-#					to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
+-#					where XXXX is the code point.  Including all these
+-#					names in this file increases its size substantially
+-#					and needlessly.  The token "<CJK>" is used for the
+-#					name of these characters.  If necessary, it can be
+-#					expanded algorithmically by a parser or editor.
++#			The official names for Unicode characters U+4E00
++#			to U+9FA5, inclusive, is "CJK UNIFIED IDEOGRAPH-XXXX",
++#			where XXXX is the code point.  Including all these
++#			names in this file increases its size substantially
++#			and needlessly.  The token "<CJK>" is used for the
++#			name of these characters.  If necessary, it can be
++#			expanded algorithmically by a parser or editor.
+ #
+ #	The entries are in BIG5 order
+ #
+-#	Any comments or problems, contact <John_Jenkins@taligent.com>
++#  Revision History:
++#
++#    v2.0, 2015 December 02
++#    updates to copyright notice and terms of use
++#    no changes to character mappings
++#
++#    v1.0, 2011 October 14
++#    Updated terms of use to current wording.
++#    Updated contact information.
++#    No changes to the mapping data.
++#
++#    v0.0d3, 11 February 1994
++#    First release.
+ #
++#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
++#    for any questions or comments or to report errors in the data.
+ #
+-0x0	0x0
+-0x1	0x1
+-0x2	0x2
+-0x3	0x3
+-0x4	0x4
+-0x5	0x5
+-0x6	0x6
+-0x7	0x7
+-0x8	0x8
+-0x9	0x9
+-0xA	0xA
+-0xB	0xB
+-0xC	0xC
+-0xD	0xD
+-0xE	0xE
+-0xF	0xF
+-0x10	0x10
+-0x11	0x11
+-0x12	0x12
+-0x13	0x13
+-0x14	0x14
+-0x15	0x15
+-0x16	0x16
+-0x17	0x17
+-0x18	0x18
+-0x19	0x19
+-0x1A	0x1A
+-0x1B	0x1B
+-0x1C	0x1C
+-0x1D	0x1D
+-0x1E	0x1E
+-0x1F	0x1F
+-0x20	0x20
+-0x21	0x21
+-0x22	0x22
+-0x23	0x23
+-0x24	0x24
+-0x25	0x25
+-0x26	0x26
+-0x27	0x27
+-0x28	0x28
+-0x29	0x29
+-0x2A	0x2A
+-0x2B	0x2B
+-0x2C	0x2C
+-0x2D	0x2D
+-0x2E	0x2E
+-0x2F	0x2F
+-0x30	0x30
+-0x31	0x31
+-0x32	0x32
+-0x33	0x33
+-0x34	0x34
+-0x35	0x35
+-0x36	0x36
+-0x37	0x37
+-0x38	0x38
+-0x39	0x39
+-0x3A	0x3A
+-0x3B	0x3B
+-0x3C	0x3C
+-0x3D	0x3D
+-0x3E	0x3E
+-0x3F	0x3F
+-0x40	0x40
+-0x41	0x41
+-0x42	0x42

_link Changed

mod_php8.conf Changed

php-8.1.13.tar.xz.asc Deleted

php-8.1.13.tar.xz -> php-8.1.21.tar.xz Changed

php8.keyring Changed

@@ -1,415 +1,249 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
-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

repack.sh Added