Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package php8 for openSUSE:Factory checked in at 2023-06-16 16:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php8 (Old) and /work/SRC/openSUSE:Factory/.php8.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php8" Fri Jun 16 16:53:04 2023 rev:50 rq:1093234 version:8.1.20 Changes: -------- --- /work/SRC/openSUSE:Factory/php8/php8.changes 2023-05-26 20:15:02.488108162 +0200 +++ /work/SRC/openSUSE:Factory/.php8.new.15902/php8.changes 2023-06-16 16:53:57.713391653 +0200 @@ -1,0 +2,16 @@ +Tue May 30 16:59:37 UTC 2023 - pgaj...@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 + +------------------------------------------------------------------- Old: ---- php-8.1.19.tar.xz New: ---- php-8.1.20.tar.xz php-unicode-allow-redistribution.patch repack.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php8.spec ++++++ --- /var/tmp/diff_new_pack.jIgEMw/_old 2023-06-16 16:53:58.489396268 +0200 +++ /var/tmp/diff_new_pack.jIgEMw/_new 2023-06-16 16:53:58.493396292 +0200 @@ -57,7 +57,7 @@ %bcond_without sodium Name: %{pprefix}%{php_name}%{psuffix} -Version: 8.1.19 +Version: 8.1.20 Release: 0 Summary: Interpreter for the PHP scripting language version 8 License: MIT AND PHP-3.01 @@ -70,6 +70,8 @@ Source6: macros.php # 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 @@ -981,6 +983,13 @@ 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 @@ -1304,6 +1313,8 @@ echo "; comment out next line to disable $ext extension in php" > %{buildroot}%{php_sysconf}/conf.d/${ini_name}.ini echo "${zend_}extension=$ext.so" >> %{buildroot}%{php_sysconf}/conf.d/${ini_name}.ini done +# directory for sessions +install -d %{buildroot}%{_localstatedir}/lib/%{php_name}/sessions # fix symlink (bnc#734176) ln -s %{_bindir}/php %{buildroot}%{_bindir}/%{php_name} # install the macros file: @@ -1392,6 +1403,8 @@ %dir %{extension_dir} %dir %{php_sysconf} %dir %{php_sysconf}/conf.d +%attr(0755, %{apache_user}, root) %dir %{_localstatedir}/lib/%{php_name} +%attr(0755, %{apache_user}, root) %dir %{_localstatedir}/lib/%{php_name}/sessions %files cli %defattr(-, root, root) ++++++ mod_php8.conf ++++++ --- /var/tmp/diff_new_pack.jIgEMw/_old 2023-06-16 16:53:58.561396696 +0200 +++ /var/tmp/diff_new_pack.jIgEMw/_new 2023-06-16 16:53:58.565396720 +0200 @@ -10,6 +10,9 @@ DirectoryIndex index.php7 DirectoryIndex index.php8 DirectoryIndex index.php + + php_value session.save_handler "files" + php_value session.save_path "/var/lib/php8/sessions" </IfModule> ++++++ php-8.1.19.tar.xz -> php-8.1.20.tar.xz ++++++ /work/SRC/openSUSE:Factory/php8/php-8.1.19.tar.xz /work/SRC/openSUSE:Factory/.php8.new.15902/php-8.1.20.tar.xz differ: char 25, line 1 ++++++ php-ini.patch ++++++ --- /var/tmp/diff_new_pack.jIgEMw/_old 2023-06-16 16:53:58.609396982 +0200 +++ /var/tmp/diff_new_pack.jIgEMw/_new 2023-06-16 16:53:58.609396982 +0200 @@ -29,4 +29,17 @@ ; 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_value[session.save_path] = /var/lib/php8/sessions + + ; The address on which to accept FastCGI requests. + ; Valid syntaxes are: ++++++ php-sort-filelist-phar.patch ++++++ --- /var/tmp/diff_new_pack.jIgEMw/_old 2023-06-16 16:53:58.625397077 +0200 +++ /var/tmp/diff_new_pack.jIgEMw/_new 2023-06-16 16:53:58.625397077 +0200 @@ -1,13 +1,14 @@ -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.20/ext/phar/Makefile.frag +=================================================================== +--- php-8.1.20.orig/ext/phar/Makefile.frag ++++ php-8.1.20/ext/phar/Makefile.frag +@@ -46,7 +46,7 @@ $(builddir)/phar.phar: $(builddir)/phar. + if [ $(TEST_PHP_EXECUTABLE_RES) -ne 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-unicode-allow-redistribution.patch ++++++ ++++ 601 lines (skipped) ++++++ repack.sh ++++++ #!/bin/sh version=$(grep '^Version:' php8.spec | sed 's/Version:\s*\([0-9\.]\+\).*/\1/') if [ -d php-$version ]; then echo "php-$version exists, please remove it" exit 1 fi echo echo Verifying archive wget https://secure.php.net/distributions/php-$version.tar.xz.asc gpg --verify php-$version.tar.xz.asc php-$version.tar.xz rm php-$version.tar.xz.asc echo echo Extracting original archive tar -xf php-$version.tar.xz echo echo Patching unicode files pushd php-*/ # will fail as the issue is fixed patch -p1 < ../php-unicode-allow-redistribution.patch popd echo echo Creating repacked archive tar -cJf php-$version.tar.xz php-$version echo echo Done
