diff --git a/.gitignore b/.gitignore index 6dc7f79..eb3f58e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/php-7.3.11.tar.xz +SOURCES/php-7.3.20.tar.xz diff --git a/.rh-php73-php.metadata b/.rh-php73-php.metadata index b485ead..82c7342 100644 --- a/.rh-php73-php.metadata +++ b/.rh-php73-php.metadata @@ -1 +1 @@ -9f1df5b07afe4f1244de1aa95ce59a558f51d17d SOURCES/php-7.3.11.tar.xz +d0dd05fa421e0f581960eda6cb8a256abb98b920 SOURCES/php-7.3.20.tar.xz diff --git a/SOURCES/php-5.6.3-embed.patch b/SOURCES/php-5.6.3-embed.patch index d9c04f6..38eea1d 100644 --- a/SOURCES/php-5.6.3-embed.patch +++ b/SOURCES/php-5.6.3-embed.patch @@ -18,7 +18,7 @@ diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in php_cgi_binary=NONE configure_options="@CONFIGURE_OPTIONS@" -php_sapis="@PHP_INSTALLED_SAPIS@" -+php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler embed fpm phpdbg @PHP_INSTALLED_SAPIS@" # Set php_cli_binary and php_cgi_binary if available for sapi in $php_sapis; do diff --git a/SOURCES/php-7.2.4-fixheader.patch b/SOURCES/php-7.2.4-fixheader.patch deleted file mode 100644 index 52a4121..0000000 --- a/SOURCES/php-7.2.4-fixheader.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up php-7.2.4RC1/configure.ac.fixheader php-7.2.4RC1/configure.ac ---- php-7.2.4RC1/configure.ac.fixheader 2018-03-13 12:42:47.594623100 +0100 -+++ php-7.2.4RC1/configure.ac 2018-03-13 12:43:35.591871825 +0100 -@@ -1275,7 +1275,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` - fi - AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) - --PHP_UNAME=`uname -a | xargs` -+PHP_UNAME=`uname | xargs` - AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) - PHP_OS=`uname | xargs` - AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) diff --git a/SOURCES/php-7.3.20-fixheader.patch b/SOURCES/php-7.3.20-fixheader.patch new file mode 100644 index 0000000..6bbdfbd --- /dev/null +++ b/SOURCES/php-7.3.20-fixheader.patch @@ -0,0 +1,13 @@ +diff -up ./configure.ac.fixheader ./configure.ac +--- ./configure.ac.fixheader 2020-07-06 16:04:56.069183751 +0200 ++++ ./configure.ac 2020-07-06 16:05:52.044046238 +0200 +@@ -1350,7 +1350,8 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` + fi + AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) + +-PHP_UNAME=`uname -a | xargs` ++UNAME=`uname -a | xargs` ++PHP_UNAME=${PHP_UNAME:-$UNAME} + AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) + PHP_OS=`uname | xargs` + AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) diff --git a/SPECS/php.spec b/SPECS/php.spec index d7bec5e..e1e1ce5 100644 --- a/SPECS/php.spec +++ b/SPECS/php.spec @@ -60,7 +60,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: 7.3.11 +Version: 7.3.20 Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend @@ -72,7 +72,7 @@ License: PHP and Zend and BSD and MIT and ASL 1.0 and NCSA Group: Development/Languages URL: http://www.php.net/ -Source0: http://www.php.net/distributions/php-%{version}.tar.xz +Source0: https://www.php.net/distributions/php-%{version}.tar.xz Source1: php.conf Source2: php.ini Source3: macros.php @@ -104,7 +104,7 @@ Patch43: php-7.3.0-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-7.2.3-ldap_r.patch # Make php_config.h constant across builds -Patch46: php-7.2.4-fixheader.patch +Patch46: php-7.3.20-fixheader.patch # drop "Configure command" from phpinfo output Patch47: php-5.6.3-phpinfo.patch @@ -772,6 +772,7 @@ sed -e 's:%{_root_sysconfdir}:%{_sysconfdir}:' \ %build # Set build date from https://reproducible-builds.org/specs/source-date-epoch/ export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) +export PHP_UNAME=$(uname) # aclocal workaround - to be improved cat `aclocal --print-ac-dir`/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4 @@ -927,6 +928,7 @@ popd without_shared="--without-gd \ --disable-dom --disable-dba --without-unixODBC \ --disable-opcache \ + --disable-phpdbg \ --disable-json \ --disable-xmlreader --disable-xmlwriter \ --without-sqlite3 --disable-phar --disable-fileinfo \ @@ -1452,6 +1454,9 @@ fi %changelog +* Fri Jul 10 2020 Remi Collet - 7.3.20-1 +- update to 7.3.20 #1853211 + * Thu Oct 31 2019 Remi Collet - 7.3.11-1 - update to 7.3.11 #1766645