diff --git a/php-8.4.0-embed.patch b/php-8.4.6-embed.patch similarity index 68% rename from php-8.4.0-embed.patch rename to php-8.4.6-embed.patch index ca4b4036854d149ee8d321eaae501c6933c24b98..72b5e4ce75958658224111d8444d110870080403 100644 --- a/php-8.4.0-embed.patch +++ b/php-8.4.6-embed.patch @@ -1,10 +1,10 @@ diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 ---- ./sapi/embed/config.m4.embed 2024-07-03 16:17:17.973277200 +0200 -+++ ./sapi/embed/config.m4 2024-07-03 16:19:32.224546927 +0200 -@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then - [yes|shared], [ - LIBPHP_CFLAGS="-shared" - PHP_EMBED_TYPE=shared +--- ./sapi/embed/config.m4.embed 2025-03-26 07:14:03.223791152 +0100 ++++ ./sapi/embed/config.m4 2025-03-26 07:16:43.185955159 +0100 +@@ -15,7 +15,8 @@ if test "$PHP_EMBED" != "no"; then + SAPI_SHARED="libs/libphp.dylib" + PHP_EMBED_TYPE=shared-dylib + ], [PHP_EMBED_TYPE=shared]) - INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(orig_libdir); \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(orig_libdir)" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)" + INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" @@ -12,8 +12,8 @@ diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 [static], [ LIBPHP_CFLAGS="-static" diff -up ./scripts/php-config.in.embed ./scripts/php-config.in ---- ./scripts/php-config.in.embed 2024-07-03 16:17:17.973277200 +0200 -+++ ./scripts/php-config.in 2024-07-03 16:20:00.439654444 +0200 +--- ./scripts/php-config.in.embed 2025-03-25 19:59:01.000000000 +0100 ++++ ./scripts/php-config.in 2025-03-26 07:14:03.223870699 +0100 @@ -19,7 +19,7 @@ exe_extension="@EXEEXT@" php_cli_binary=NONE php_cgi_binary=NONE diff --git a/php-8.4.5.tar.xz b/php-8.4.6.tar.xz similarity index 32% rename from php-8.4.5.tar.xz rename to php-8.4.6.tar.xz index d99428838f30913c6a8f010663427206e2ce50f2..6ead5933f5e96ceec79369d9d32e480e4260839d 100644 --- a/php-8.4.5.tar.xz +++ b/php-8.4.6.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3270bbce4d9ec617befce52458b763fd461d475f1fe2ed878bb8573faed327 -size 13604056 +oid sha256:089b08a5efef02313483325f3bacd8c4fe311cf1e1e56749d5cc7d059e225631 +size 13612892 diff --git a/php.spec b/php.spec index 7713c9ae8f3bb263ad03c76e375fad015614de70..23b7815e218b04bf2be953d1625fe09270258cbb 100644 --- a/php.spec +++ b/php.spec @@ -61,12 +61,12 @@ %bcond_without libgd %bcond_with zip -%global upver 8.4.5 +%global upver 8.4.6 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver} -Release: 3 +Release: 1 # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -102,7 +102,7 @@ Source1002: composer.attr # Build fixes Patch1: php-8.4.0-httpd.patch Patch5: php-8.4.0-includedir.patch -Patch6: php-8.4.0-embed.patch +Patch6: php-8.4.6-embed.patch Patch8: php-8.4.0-libdb.patch Patch9: 0001-add-sw_64-support.patch @@ -1640,6 +1640,9 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %{_fileattrsdir}/composer.attr %changelog +* Wed Apr 09 2025 Funda Wang - 8.4.6-1 +- New version 8.4.6 + * Sat Mar 22 2025 Funda Wang - 8.4.5-3 - hardcode libxml2 version as what was used for building