diff --git a/macros.php b/macros.php index 4a039aac1ada864a27d81607a825e7100d4247e1..7e2108274fe1d4e0598416782f48ded4a0d6879b 100644 --- a/macros.php +++ b/macros.php @@ -19,3 +19,10 @@ %__ztsphp %{_bindir}/zts-php %pecl_xmldir %{_sharedstatedir}/php/peclxml + +%__phpize %{_bindir}/phpize +%__ztsphpize %{_bindir}/zts-phpize + +%__phpconfig %{_bindir}/php-config +%__ztsphpconfig %{_bindir}/zts-php-config + diff --git a/php-8.0.0-embed.patch b/php-8.3.20-embed.patch similarity index 67% rename from php-8.0.0-embed.patch rename to php-8.3.20-embed.patch index 27533ea4e5e11214ffea6f2d8d0390abae7abbe0..1140d33c904689632d5388904e11935181a653d9 100644 --- a/php-8.0.0-embed.patch +++ b/php-8.3.20-embed.patch @@ -1,10 +1,10 @@ diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 ---- ./sapi/embed/config.m4.embed 2020-07-07 13:51:05.879764972 +0200 -+++ ./sapi/embed/config.m4 2020-07-07 13:52:50.128412148 +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 08:07:06.692333414 +0100 ++++ ./sapi/embed/config.m4 2025-03-26 08:07:42.872879994 +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)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" + 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 2020-07-07 12:54:42.000000000 +0200 -+++ ./scripts/php-config.in 2020-07-07 13:51:05.880764968 +0200 +--- ./scripts/php-config.in.embed 2025-03-25 22:00:06.000000000 +0100 ++++ ./scripts/php-config.in 2025-03-26 08:07:06.692518461 +0100 @@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" php_cli_binary=NONE php_cgi_binary=NONE diff --git a/php-8.3.19.tar.xz b/php-8.3.20.tar.xz similarity index 32% rename from php-8.3.19.tar.xz rename to php-8.3.20.tar.xz index edee0bb6d172f5f21cb7ba67e54e9a10371947b1..e52903488ca0e0dfd57ceff4251aa259fdf934a3 100644 --- a/php-8.3.19.tar.xz +++ b/php-8.3.20.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:976e4077dd25bec96b5dfe8938052d243bbd838f95368a204896eff12756545f -size 12560852 +oid sha256:f15914e071b5bddaf1475b5f2ba68107e8b8846655f9e89690fb7cd410b0db6c +size 12549020 diff --git a/php.conf b/php.conf index 639652b42fb579e5845fa95d9cc505bbcb9156e2..0639c0a6070d9efdae1db257fd4c4c51fa141231 100644 --- a/php.conf +++ b/php.conf @@ -2,7 +2,14 @@ # The following lines prevent .user.ini files from being viewed by Web clients. # - Require all denied + + Require all denied + + + Order allow,deny + Deny from all + Satisfy All + # @@ -16,24 +23,7 @@ AddType text/html .php # DirectoryIndex index.php -# -# Redirect to local php-fpm (no mod_php in default configuration) -# - - # Enable http authorization headers - SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 - - - SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost" - - - -# -# mod_php is deprecated as FPM is now used by default with httpd in event mode -# mod_php is only used when explicitly enabled or httpd switch to prefork mode -# # mod_php options -# # # Cause the PHP interpreter to handle files with a .php extension. diff --git a/php.ini b/php.ini index 52e1e49933562efbe54747dc5339ec9073429940..d0ae9d12009bb1c0dc77ea237b1c55242ce8535d 100644 --- a/php.ini +++ b/php.ini @@ -75,7 +75,7 @@ ; php.ini-production contains settings which hold security, performance and ; best practices at its core. But please be aware, these settings may break -; compatibility with older or less security conscience applications. We +; compatibility with older or less security-conscious applications. We ; recommending using the production ini in production and testing environments. ; php.ini-development is very similar to its production variant, except it is @@ -144,6 +144,11 @@ ; Development Value: 5 ; Production Value: 5 +; session.sid_length +; Default Value: 32 +; Development Value: 26 +; Production Value: 26 + ; short_open_tag ; Default Value: On ; Development Value: Off @@ -154,6 +159,11 @@ ; Development Value: "GPCS" ; Production Value: "GPCS" +; zend.assertions +; Default Value: 1 +; Development Value: 1 +; Production Value: -1 + ; zend.exception_ignore_args ; Default Value: Off ; Development Value: Off @@ -425,6 +435,11 @@ max_input_time = 60 ; How many GET/POST/COOKIE input variables may be accepted ;max_input_vars = 1000 +; How many multipart body parts (combined input variable and file uploads) may +; be accepted. +; Default Value: -1 (Sum of max_input_vars and max_file_uploads) +;max_multipart_body_parts = 1500 + ; Maximum amount of memory a script may consume ; https://php.net/memory-limit memory_limit = 128M @@ -1040,6 +1055,10 @@ sendmail_path = /usr/sbin/sendmail -t -i ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename mail.add_x_header = Off +; Use mixed LF and CRLF line separators to keep compatibility with some +; RFC 2822 non conformant MTA. +mail.mixed_lf_and_crlf = Off + ; The path to a log file that will log all mail() calls. Log entries include ; the full path of the script, line number, To address and headers. ;mail.log = @@ -1137,9 +1156,6 @@ mysqli.default_user = ; https://php.net/mysqli.default-pw mysqli.default_pw = -; Allow or prevent reconnect -mysqli.reconnect = Off - ; If this option is enabled, closing a persistent connection will rollback ; any pending transactions of this connection, before it is put back ; into the persistent connection pool. @@ -1471,33 +1487,14 @@ session.sid_bits_per_character = 5 ; -1: Do not compile at all ; 0: Jump over assertion at run-time ; 1: Execute assertions -; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1) +; Changing from or to a negative value is only possible in php.ini! +; (For turning assertions on and off at run-time, toggle zend.assertions between the values 1 and 0) ; Default Value: 1 ; Development Value: 1 ; Production Value: -1 ; https://php.net/zend.assertions zend.assertions = -1 -; Assert(expr); active by default. -; https://php.net/assert.active -;assert.active = On - -; Throw an AssertionError on failed assertions -; https://php.net/assert.exception -;assert.exception = On - -; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) -; https://php.net/assert.warning -;assert.warning = On - -; Don't bail out by default. -; https://php.net/assert.bail -;assert.bail = Off - -; User-function to be called if an assertion fails. -; https://php.net/assert.callback -;assert.callback = 0 - [mbstring] ; language for internal character representation. ; This affects mb_send_mail() and mbstring.detect_order. diff --git a/php.spec b/php.spec index d30d6e79f2d01921c4b57226438f1c82e764cf13..74d7e3ff48b58153c5e6ed95e8f2d24c91f171f0 100644 --- a/php.spec +++ b/php.spec @@ -23,7 +23,7 @@ %global with_modphp 1 %global with_lmdb 1 %global with_sodium 1 -%global upver 8.3.19 +%global upver 8.3.20 Name: php @@ -52,7 +52,7 @@ Source15: https://www.php.net/distributions/php-keyring.gpg Patch0: php-7.4.0-httpd.patch Patch1: php-7.2.0-includedir.patch -Patch2: php-8.0.0-embed.patch +Patch2: php-8.3.20-embed.patch Patch3: php-8.1.0-libdb.patch Patch4: php-8.3.3-parser.patch @@ -205,6 +205,7 @@ Provides: php-spl, php-spl%{?_isa} Provides: php-standard = %{version}, php-standard%{?_isa} = %{version} Provides: php-tokenizer, php-tokenizer%{?_isa} Provides: php-zlib, php-zlib%{?_isa} +Requires: (libxml2%{?_isa} >= %(rpm -q --queryformat="%%{VERSION}" libxml2) if libxml2) %description common The php-common package contains files used by both the php @@ -1311,6 +1312,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %{_mandir}/man?/* %changelog +* Fri Apr 11 2025 Funda Wang - 8.3.20-1 +- New version 8.3.20 +- sync settings with remi + * Wed Mar 12 2025 Funda Wang - 8.3.19-1 - New version 8.3.19