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 4

php8.changes Changed

@@ -1,4 +1,747 @@
 -------------------------------------------------------------------
+Fri May  9 16:34:09 UTC 2025 - Arjen de Korte <suse+build@de-korte.org>
+
+- version update to 8.3.21
+    Core:
+        Fixed bug GH-18304 (Changing the properties of a DateInterval through dynamic properties triggers a SegFault).
+        Fix some leaks in php_scandir.
+    Filter:
+        Fixed bug GH-18309 (ipv6 filter integer overflow).
+    GD:
+        Fixed imagecrop() overflow with rect argument with x/width y/heigh usage in gdImageCrop().
+        Fixed GH-18243 imagettftext() overflow/underflow on font size value.
+    Intl:
+        Fix reference support for intltz_get_offset().
+    LDAP:
+        Fixed bug GH-17776 (LDAP_OPT_X_TLS_* options can't be overridden).
+        Fix NULL deref on high modification key.
+    libxml:
+        Fixed custom external entity loader returning an invalid resource leading to a confusing TypeError message.
+    OpenSSL:
+        Fix memory leak in openssl_sign() when passing invalid algorithm.
+        Fix potential leaks when writing to BIO fails.
+    PDO Firebird:
+        Fixed GH-18276 - persistent connection - "zend_mm_heap corrupted" with setAttribute() (SakiTakamachi).
+    SPL:
+        Fixed bug GH-18322 (SplObjectStorage debug handler mismanages memory).
+    Standard:
+        Fixed bug GH-18145 (php8ts crashes in php_clear_stat_cache()).
+        Fixed bug GH-18209 (Use-after-free in extract() with EXTR_REFS).
+        Fixed bug GH-18212 (fseek with SEEK_CUR whence value and negative offset leads to negative stream position).
+        Fix resource leak in iptcembed() on error.
+    Zip:
+        Fix uouv when handling empty options in ZipArchive::addGlob().
+        Fix memory leak when handling a too long path in ZipArchive::addGlob().
+
+-------------------------------------------------------------------
+Fri Apr 11 06:02:11 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.20
+    Core:
+        Fixed bug GH-17961 (use-after-free during dl()'ed module class destruction).
+        Fixed bug GH-15367 (dl() of module with aliased class crashes in shutdown).
+        Fixed bug GH-13193 again (Significant performance degradation in 'foreach').
+    DOM:
+        Fix weird unpack behaviour in DOM.
+        Fix xinclude destruction of live attributes.
+    Embed:
+        Fixed bug GH-8533 (Unable to link dynamic libphp on Mac).
+    Fuzzer:
+        Fixed bug GH-18081 (Memory leaks in error paths of fuzzer SAPI).
+    GD:
+        Fixed bug GH-17984 (calls with arguments as array with references).
+    Intl:
+        Fix locale_compose and locale_lookup to work with their array argument with values as references.
+        Fix dateformat_format when the time is an array of references.
+        Fix UConverter::transcode with substitutes as references.
+    Mbstring:
+        Fixed bug GH-17989 (mb_output_handler crash with unset http_output_conv_mimetypes).
+    Opcache:
+        Fixed bug GH-18112 (NULL access with preloading and INI option).
+        Fixed bug GH-18107 (Opcache CFG jmp optimization with try-finally breaks the exception table).
+    PDO:
+        Fix memory leak when destroying PDORow.
+    SOAP:
+        Fixed bug #66049 (Typemap can break parsing in parse_packet_soap leading to a segfault) .
+    SPL:
+        Fixed bug GH-18018 (RC1 data returned from offsetGet causes UAF in ArrayObject).
+    Treewide:
+        Fixed bug GH-17736 (Assertion failure zend_reference_destroy()).
+    Windows:
+        Fixed bug GH-17836 (zend_vm_gen.php shouldn't break on Windows line endings).
+
+-------------------------------------------------------------------
+Fri Mar 14 06:10:13 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.19
+    BCMath:
+        Fixed bug GH-17398 (bcmul memory leak).
+    Core:
+        Fixed bug GH-17623 (Broken stack overflow detection for variable compilation).
+        Fixed bug GH-17618 (UnhandledMatchError does not take zend.exception_ignore_args=1 into account).
+        Fix fallback paths in fast_long_{add,sub}_function.
+        Fixed bug GH-17718 (Calling static methods on an interface that has `__callStatic` is allowed).
+        Fixed bug GH-17797 (zend_test_compile_string crash on invalid script path).
+        Fixed GHSA-rwp7-7vc6-8477 (Reference counting in php_request_shutdown causes Use-After-Free). (CVE-2024-11235)
+    DOM:
+        Fixed bug GH-17847 (xinclude destroys live node).
+    FFI:
+        Fix FFI Parsing of Pointer Declaration Lists.
+    FPM:
+        Fixed bug GH-17643 (FPM with httpd ProxyPass encoded PATH_INFO env).
+    GD:
+        Fixed bug GH-17772 (imagepalettetotruecolor crash with memory_limit=2M).
+    LDAP:
+        Fixed bug GH-17704 (ldap_search fails when $attributes contains a non-packed array with numerical keys).
+    LibXML:
+        Fixed GHSA-wg4p-4hqh-c3g9 (Reocurrence of #72714).
+        Fixed GHSA-p3x9-6h7p-cgfc (libxml streams use wrong `content-type` header when requesting a redirected resource). (CVE-2025-1219)
+    MBString:
+        Fixed bug GH-17503 (Undefined float conversion in mb_convert_variables).
+    Opcache:
+        Fixed bug GH-17654 (Multiple classes using same trait causes function JIT crash).
+        Fixed bug GH-17577 (JIT packed type guard crash).
+        Fixed bug GH-17899 (zend_test_compile_string with invalid path when opcache is enabled).
+        Fixed bug GH-17868 (Cannot allocate memory with tracing JIT).
+    PDO_SQLite:
+        Fixed GH-17837 ()::getColumnMeta() on unexecuted statement segfaults).
+        Fix cycle leak in sqlite3 setAuthorizer().
+    Phar:
+        Fixed bug GH-17808: PharFileInfo refcount bug.
+    PHPDBG:
+        Partially fixed bug GH-17387 (Trivial crash in phpdbg lexer).
+        Fix memory leak in phpdbg calling registered function.
+    Reflection:
+        Fixed bug GH-15902 (Core dumped in ext/reflection/php_reflection.c).
+    Standard:
+        Fixed bug #72666 (stat cache clearing inconsistent between file:// paths and plain paths).
+    Streams:
+        Fixed bug GH-17650 (realloc with size 0 in user_filters.c).
+        Fix memory leak on overflow in _php_stream_scandir().
+        Fixed GHSA-hgf5-96fm-v528 (Stream HTTP wrapper header check might omit basic auth header). (CVE-2025-1736)
+        Fixed GHSA-52jp-hrpf-2jff (Stream HTTP wrapper truncate redirect location to 1024 bytes). (CVE-2025-1861)
+        Fixed GHSA-pcmh-g36c-qc44 (Streams HTTP wrapper does not fail for headers without colon). (CVE-2025-1734)
+        Fixed GHSA-v8xr-gpvj-cx9g (Header parser of `http` stream wrapper does not handle folded headers). (CVE-2025-1217)
+    Windows:
+        Fixed phpize for Windows 11 (24H2).
+        Fixed GH-17855 (CURL_STATICLIB flag set even if linked with shared lib).
+    Zlib:
+        Fixed bug GH-17745 (zlib extension incorrectly handles object arguments).
+        Fix memory leak when encoding check fails.
+        Fix zlib support for large files.
+- fixes: CVE-2025-1217 bsc#1239664
+         CVE-2024-11235 bsc#1239666
+         CVE-2025-1734 bsc#1239668
+         CVE-2025-1861 bsc#1239669
+         CVE-2025-1736 bsc#1239670
+         CVE-2025-1219 bsc#1239667
+
+-------------------------------------------------------------------
+Fri Feb 14 07:11:17 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.17
+    Core:
+        Fixed bug GH-16892 (ini_parse_quantity() fails to parse inputs starting with 0x0b).
+        Fixed bug GH-16886 (ini_parse_quantity() fails to emit warning for 0x+0).
+        Fixed bug GH-17214 (Relax final+private warning for trait methods with inherited final).
+        Fixed NULL arithmetic during system program execution on Windows.
+        Fixed potential OOB when checking for trailing spaces on Windows.
+        Fixed bug GH-17408 (Assertion failure Zend/zend_exceptions.c).
+        Fix may_have_extra_named_args flag for ZEND_AST_UNPACK.
+        Fix NULL arithmetic in System V shared memory emulation for Windows.
+    DOM:
+        Fixed bug GH-17500 (Segfault with requesting nodeName on nameless doctype).
+    Enchant:
+        Fix crashes in enchant when passing null bytes.
+    FTP:
+        Fixed bug GH-16800 (ftp functions can abort with EINTR).
+    GD:
+        Fixed bug GH-17349 (Tiled truecolor filling looses single color transparency).
+        Fixed bug GH-17373 (imagefttext() ignores clipping rect for palette images).
+        Ported fix for libgd 223 (gdImageRotateGeneric() does not properly interpolate).
+    Intl:
+        Fixed bug GH-11874 (intl causing segfault in docker images).
+        Fixed bug GH-17469 (UConverter::transcode always emit E_WARNING on invalid encoding).
+    Opcache:
+        Fixed bug GH-17307 (Internal closure causes JIT failure).
+        Fixed bug GH-17564 (Potential UB when reading from / writing to struct padding).
+    PDO:
+        Fixed a memory leak when the GC is used to free a PDOStatment.
+        Fixed a crash in the PDO Firebird Statement destructor.
+        Fixed UAFs when changing default fetch class ctor args.
+    Phar:
+        Fixed bug GH-17518 (offset overflow phar extractTo()).
+    PHPDBG:
+        Fix crashes in function registration + test.
+    Session:
+        Fix type confusion with session SID constant.
+        Fixed bug GH-17541 (ext/session NULL pointer dereferencement during ID reset).
+    SimpleXML:
+        Fixed bug GH-17409 (Assertion failure Zend/zend_hash.c:1730).
+    SNMP:
+        Fixed bug GH-17330 (SNMP::setSecurity segfault on closed session).
+    SPL:
+        Fixed bug GH-17463 (crash on SplTempFileObject::ftruncate with negative value).
+    Zip:
+        Fixed bug GH-17139 (Fix zip_entry_name() crash on invalid entry).
+
+-------------------------------------------------------------------
+Fri Feb  7 09:29:53 UTC 2025 - pgajdos@suse.com
+
+- obsolete also apache2-mod_php7 bsc#1236850
+
+-------------------------------------------------------------------
+Fri Jan 17 07:28:45 UTC 2025 - pgajdos@suse.com
+
+- version update to 8.3.16
+    Core:
+        Fixed bug GH-17106 (ZEND_MATCH_ERROR misoptimization).
+        Fixed bug GH-17162 (zend_array_try_init() with dtor can cause engine UAF).

php8.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package php8
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -58,7 +58,7 @@
 %bcond_without	sodium
 
 Name:           %{pprefix}%{php_name}%{psuffix}
-Version:        8.3.7
+Version:        8.3.21
 Release:        0
 Summary:        Interpreter for the PHP scripting language version 8
 License:        MIT AND PHP-3.01
@@ -163,11 +163,9 @@
 BuildRequires:  pkgconfig(libargon2)
 %endif
 %if "%{flavor}" == "test"
-BuildRequires:  apache-rex
 BuildRequires:  mod_php_any = %{version}
 BuildRequires:  php-cli = %{version}
 BuildRequires:  php-fpm = %{version}
-%apache_rex_deps
 %endif
 
 %if "%{flavor}" == ""
@@ -219,8 +217,10 @@
 Provides:       php-xml(vhng) = %{php_vhng_branch}
 Provides:       zend = %{zendver}
 # conflicts other php major versions with and should replace it
-Conflicts:      php < %{version}
-Conflicts:      php72
+Obsoletes:      php < %{version}
+Obsoletes:      php7
+Obsoletes:      php72
+Obsoletes:      php74
 # mcrypt was removed in php 7.2
 Obsoletes:      php7-mcrypt
 # json is now integral part of core, cannot be disabled
@@ -246,6 +246,7 @@
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
 Conflicts:      php-cli < %{version}
+Obsoletes:      php7-cli
 
 %description cli
 PHP is a server-side HTML embedded scripting language designed
@@ -270,8 +271,8 @@
 Requires:       pkgconfig(libxml-2.0) >= 2.9.0
 Provides:       php-devel = %{version}
 Provides:       php-devel(vhng) = %{php_vhng_branch}
-Provides:       php-devel(vhng) = %{php_vhng_branch}
 Conflicts:      php-devel < %{version}
+Obsoletes:      php7-devel
 
 %description devel
 PHP is a server-side HTML embedded scripting language designed
@@ -302,6 +303,7 @@
 Provides:       mod_php_any = %{version}
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
+Obsoletes:      apache2-mod_php7
 Obsoletes:      mod_php_any < %{version}
 
 %description
@@ -327,6 +329,7 @@
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
 Conflicts:      php-fastcgi < %{version}
+Obsoletes:      php7-fastcgi
 
 %description
 PHP is a server-side, cross-platform HTML embedded scripting language.
@@ -349,6 +352,8 @@
 Provides:       php-sapi = %{version}
 Provides:       php-sapi(vhng) = %{php_vhng_branch}
 Conflicts:      php-fpm < %{version}
+Obsoletes:      php7-fpm
+
 %{?systemd_ordering}
 
 %description
@@ -401,6 +406,7 @@
 Provides:       php-bcmath = %{version}
 Provides:       php-bcmath(vhng) = %{php_vhng_branch}
 Obsoletes:      php-bcmath < %{version}
+Obsoletes:      php7-bcmath
 
 %description bcmath
 Binary Calculator which supports numbers of any size and precision,
@@ -413,6 +419,7 @@
 Provides:       php-bz2 = %{version}
 Provides:       php-bz2(vhng) = %{php_vhng_branch}
 Obsoletes:      php-bz2 < %{version}
+Obsoletes:      php7-bz2
 
 %description bz2
 PHP functions to read and write bzip2 (.bz2) compressed files.
@@ -424,6 +431,7 @@
 Provides:       php-calendar = %{version}
 Provides:       php-calendar(vhng) = %{php_vhng_branch}
 Obsoletes:      php-calendar < %{version}
+Obsoletes:      php7-calendar
 
 %description calendar
 PHP functions for converting between different calendar formats.
@@ -435,6 +443,7 @@
 Provides:       php-ctype = %{version}
 Provides:       php-ctype(vhng) = %{php_vhng_branch}
 Obsoletes:      php-ctype < %{version}
+Obsoletes:      php7-ctype
 
 %description ctype
 PHP functions for checking whether a character or string falls into a
@@ -447,6 +456,7 @@
 Provides:       php-curl = %{version}
 Provides:       php-curl(vhng) = %{php_vhng_branch}
 Obsoletes:      php-curl < %{version}
+Obsoletes:      php7-curl
 
 %description curl
 PHP interface to libcurl that allows you to connect to and communicate
@@ -460,6 +470,7 @@
 Provides:       php-dba = %{version}
 Provides:       php-dba(vhng) = %{php_vhng_branch}
 Obsoletes:      php-dba < %{version}
+Obsoletes:      php7-dba
 
 %description dba
 This is a general abstraction layer for several file-based databases.
@@ -488,6 +499,7 @@
 Provides:       php-dom = %{version}
 Provides:       php-dom(vhng) = %{php_vhng_branch}
 Obsoletes:      php-dom < %{version}
+Obsoletes:      php7-dom
 
 %description dom
 This module adds Document Object Model (DOM) support.
@@ -501,6 +513,7 @@
 Obsoletes:      php-enchant < %{version}
 # Obsolete pspell plugin as enchant is favored solution (goodbye aspell)
 Obsoletes:      php7-pspell
+Obsoletes:      php7-enchant
 
 %description enchant
 Enchant is the PHP binding for the Enchant library. Enchant steps in
@@ -517,6 +530,7 @@
 Provides:       php-exif = %{version}
 Provides:       php-exif(vhng) = %{php_vhng_branch}
 Obsoletes:      php-exif < %{version}
+Obsoletes:      php7-exif
 
 %description exif
 PHP functions for extracting EXIF (Exchangable Image File Format;
@@ -529,6 +543,7 @@
 Requires:       php = %{version}
 Provides:       php-ffi = %{version}
 Provides:       php-ffi(vhng) = %{php_vhng_branch}
+Obsoletes:      php7-ffi
 
 %description ffi
 This extension allows the loading of shared libraries (.DLL or .so),
@@ -543,6 +558,7 @@
 Provides:       php-fileinfo = %{version}
 Provides:       php-fileinfo(vhng) = %{php_vhng_branch}
 Obsoletes:      php-fileinfo < %{version}
+Obsoletes:      php7-fileinfo
 
 %description fileinfo
 The functions in this module try to guess the content type and
@@ -557,6 +573,7 @@
 Provides:       php-ftp = %{version}
 Provides:       php-ftp(vhng) = %{php_vhng_branch}
 Obsoletes:      php-ftp < %{version}
+Obsoletes:      php7-ftp
 
 %description ftp
 PHP functions for access to file servers speaking the File Transfer
@@ -569,6 +586,7 @@
 Provides:       php-gd = %{version}
 Provides:       php-gd(vhng) = %{php_vhng_branch}
 Obsoletes:      php-gd < %{version}
+Obsoletes:      php7-gd
 
 %description gd
 PHP functions to create and manipulate image files in a variety of
@@ -582,6 +600,7 @@
 Provides:       php-gettext = %{version}
 Provides:       php-gettext(vhng) = %{php_vhng_branch}
 Obsoletes:      php-gettext < %{version}
+Obsoletes:      php7-gettext
 
 %description gettext
 PHP functions that implement a Native Language Support (NLS) API which
@@ -594,6 +613,7 @@
 Provides:       php-gmp = %{version}

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.3.3/ext/phar/phar.c
+Index: php-8.3.16/ext/phar/phar.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/phar.c
-+++ php-8.3.3/ext/phar/phar.c
-@@ -2993,7 +2993,7 @@ int phar_flush(phar_archive_data *phar,
+--- php-8.3.16.orig/ext/phar/phar.c
++++ php-8.3.16/ext/phar/phar.c
+@@ -2997,7 +2997,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.3.3/ext/phar/phar_internal.h
+Index: php-8.3.16/ext/phar/phar_internal.h
 ===================================================================
---- php-8.3.3.orig/ext/phar/phar_internal.h
-+++ php-8.3.3/ext/phar/phar_internal.h
+--- php-8.3.16.orig/ext/phar/phar_internal.h
++++ php-8.3.16/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.3.3/ext/phar/stream.c
+Index: php-8.3.16/ext/phar/stream.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/stream.c
-+++ php-8.3.3/ext/phar/stream.c
+--- php-8.3.16.orig/ext/phar/stream.c
++++ php-8.3.16/ext/phar/stream.c
 @@ -474,7 +474,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.3.3/ext/phar/tar.c
+Index: php-8.3.16/ext/phar/tar.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/tar.c
-+++ php-8.3.3/ext/phar/tar.c
-@@ -965,7 +965,7 @@ int phar_tar_flush(phar_archive_data *ph
+--- php-8.3.16.orig/ext/phar/tar.c
++++ php-8.3.16/ext/phar/tar.c
+@@ -969,7 +969,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.3.3/ext/phar/util.c
+Index: php-8.3.16/ext/phar/util.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/util.c
-+++ php-8.3.3/ext/phar/util.c
+--- php-8.3.16.orig/ext/phar/util.c
++++ php-8.3.16/ext/phar/util.c
 @@ -584,7 +584,7 @@ phar_entry_data *phar_get_or_create_entr
  
  	phar_add_virtual_dirs(phar, path, path_len);
@@ -94,10 +94,10 @@
  	etemp.is_crc_checked = 1;
  	etemp.phar = phar;
  	etemp.filename = estrndup(path, path_len);
-Index: php-8.3.3/ext/phar/zip.c
+Index: php-8.3.16/ext/phar/zip.c
 ===================================================================
---- php-8.3.3.orig/ext/phar/zip.c
-+++ php-8.3.3/ext/phar/zip.c
+--- php-8.3.16.orig/ext/phar/zip.c
++++ php-8.3.16/ext/phar/zip.c
 @@ -1236,7 +1236,7 @@ int phar_zip_flush(phar_archive_data *ph
  
  	pass.error = &temperr;

php-date-regenerate-lexers.patch Changed

@@ -1,8 +1,8 @@
-Index: php-8.2.7/ext/date/config0.m4
+Index: php-8.3.15/ext/date/config0.m4
 ===================================================================
---- php-8.2.7.orig/ext/date/config0.m4
-+++ php-8.2.7/ext/date/config0.m4
-@@ -23,6 +23,8 @@ timelib_sources="lib/astro.c lib/dow.c l
+--- php-8.3.15.orig/ext/date/config0.m4
++++ php-8.3.15/ext/date/config0.m4
+@@ -27,6 +27,8 @@ timelib_sources="lib/astro.c lib/dow.c l
  
  PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
  
@@ -11,10 +11,10 @@
  PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
  PHP_ADD_INCLUDE($ext_builddir/lib)
  PHP_ADD_INCLUDE($ext_srcdir/lib)
-Index: php-8.2.7/ext/date/Makefile.frag
+Index: php-8.3.15/ext/date/Makefile.frag
 ===================================================================
 --- /dev/null
-+++ php-8.2.7/ext/date/Makefile.frag
++++ php-8.3.15/ext/date/Makefile.frag
 @@ -0,0 +1,6 @@
 +$(srcdir)/lib/parse_date.c: $(srcdir)/lib/parse_date.re
 +	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) -b --no-generation-date -o ext/date/lib/parse_date.c ext/date/lib/parse_date.re)

php-systzdata-v24.patch Changed

@@ -36,10 +36,10 @@
 r1: initial revision
 
 
-diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
-index 6b803bf33e..53c3cdb3f4 100644
---- a/ext/date/config0.m4
-+++ b/ext/date/config0.m4
+Index: php-8.3.15/ext/date/config0.m4
+===================================================================
+--- php-8.3.15.orig/ext/date/config0.m4
++++ php-8.3.15/ext/date/config0.m4
 @@ -4,6 +4,19 @@ AC_CHECK_HEADERS(io.h)
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
@@ -57,13 +57,13 @@
 +   fi
 +fi
 +
- 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 --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
-index c7f93580d7..ec196a98b6 100644
---- a/ext/date/lib/parse_tz.c
-+++ b/ext/date/lib/parse_tz.c
+ AX_CHECK_COMPILE_FLAG(-Wno-implicit-fallthrough,
+   PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough",,
+   -Werror)
+Index: php-8.3.15/ext/date/lib/parse_tz.c
+===================================================================
+--- php-8.3.15.orig/ext/date/lib/parse_tz.c
++++ php-8.3.15/ext/date/lib/parse_tz.c
 @@ -26,9 +26,33 @@
  #include "timelib.h"
  #include "timelib_private.h"
@@ -98,7 +98,7 @@
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -95,6 +119,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+@@ -95,6 +119,11 @@ static int read_php_preamble(const unsig
  {
  	uint32_t version;
  
@@ -110,7 +110,7 @@
  	/* read ID */
  	version = (*tzf)3 - '0';
  	*tzf += 4;
-@@ -577,7 +606,475 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
+@@ -577,7 +606,475 @@ void timelib_dump_tzinfo(timelib_tzinfo
  	}
  }
  
@@ -178,7 +178,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
@@ -245,10 +245,10 @@
 +
 +        if (*p == '#' || *p == '\0' || *p == '\n')
 +            continue;
-+        
++
 +        if (!isalpha(p0) || !isalpha(p1) || p2 != '\t')
 +            continue;
-+        
++
 +        /* code => AA */
 +        code = p;
 +        p2 = 0;
@@ -282,7 +282,7 @@
 +
 +        if (*p == '\n' || *p == '\t')
 +            *p = '\0';
-+        
++
 +        hash = tz_hash(name);
 +        i = malloc(sizeof *i);
 +        memcpy(i->code, code, 2);
@@ -302,7 +302,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);
@@ -318,7 +318,7 @@
 +    }
 +
 +    return NULL;
-+}    
++}
 +
 +/* Filter out some non-tzdata files and the posix/right databases, if
 + * present. */
@@ -393,7 +393,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);
@@ -414,22 +414,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);
@@ -447,7 +447,7 @@
 +
 +			free(ents--count);
 +		}
-+		
++
 +		if (count != -1) free(ents);
 +		free(top);
 +	} while (dirstack_top);
@@ -472,7 +472,7 @@
 +{
 +        size_t n;
 +        char *data, *p;
-+        
++
 +        data = malloc(3 * sysdb->index_size + sizeof(FAKE_HEADER) - 1);
 +
 +        p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
@@ -505,7 +505,7 @@
 +                        ent->pos = 0;
 +                }
 +        }
-+        
++
 +        sysdb->data = (unsigned char *)data;
 +}
 +
@@ -554,7 +554,7 @@
 +	struct stat st;
 +	char *p;
 +	int fd;
-+	
++
 +	if (timezone0 == '\0' || strstr(timezone, "..") != NULL) {
 +		return NULL;
 +	}
@@ -577,7 +577,7 @@
 +	*length = st.st_size;
 +	p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
 +	close(fd);
-+	
++
 +	return p != MAP_FAILED ? p : NULL;
 +}
 +
@@ -587,7 +587,7 @@
  {
  	int left = 0, right = tzdb->index_size - 1;
  
-@@ -603,9 +1100,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone,
+@@ -603,9 +1100,49 @@ static int seek_to_tz_position(const uns
  	return 0;
  }
  
@@ -637,7 +637,7 @@
  }
  
  const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -617,7 +1154,32 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
+@@ -617,7 +1154,32 @@ const timelib_tzdb_index_entry *timelib_
  int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb)

_link Changed

php-8.3.7.tar.xz -> php-8.3.21.tar.xz Changed

php-8.3.21.tar.xz.asc Added

php-8.3.7.tar.xz.asc Deleted