Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2019-02-13 10:18:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Wed Feb 13 10:18:03 2019 rev:55 rq:673327 version:7.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2019-01-26 22:18:51.171028847 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.28833/php7.changes 2019-02-13 10:18:04.861341727 +0100 @@ -1,0 +2,37 @@ +Thu Feb 7 08:29:10 UTC 2019 - Petr Gajdos <pgaj...@suse.com> + +- set pcre.jit=0 until https://bugs.php.net/bug.php?id=77260 + is solved [bsc#1124446] + +------------------------------------------------------------------- +Thu Jan 31 21:40:40 UTC 2019 - Arjen de Korte <suse+bu...@de-korte.org> + +- spec file cleanup + * add BuildRequires gpg2 + * remove outdated README.SUSE-pear - Squirrelmail uses PDO instead + of DB now by default + * remove outdated php7-depdb-path.patch - Horde packages no longer + build so need to be fixed anyway +- update php7.rpmlintrc to suppress warnings that aren't fixable and + drown out other warnings + +------------------------------------------------------------------- +Wed Jan 30 14:11:38 UTC 2019 - Arjen de Korte <suse+bu...@de-korte.org> + +- provide the version of PEAR, rather than the PHP version in php-pear + +------------------------------------------------------------------- +Wed Jan 30 11:37:06 UTC 2019 - Arjen de Korte <suse+bu...@de-korte.org> + +- configure cache_dir, metadata_dir and sig_bin through PHP_PEAR_* + exports + +------------------------------------------------------------------- +Tue Jan 29 12:44:12 UTC 2019 - Arjen de Korte <suse+bu...@de-korte.org> + +- remove install-pear-nozlib.phar (the bundled and tested version from + the PHP sources is fresh enough for our purposes) +- merge back php7-pear-Archive_Tar in php7-pear +- rename cache_dir to pear and create it + +------------------------------------------------------------------- Old: ---- README.SUSE-pear install-pear-nozlib.phar install-pear-nozlib.phar.sig php7-depdb-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.zwnkLm/_old 2019-02-13 10:18:06.049341275 +0100 +++ /var/tmp/diff_new_pack.zwnkLm/_new 2019-02-13 10:18:06.053341273 +0100 @@ -1,7 +1,7 @@ # # spec file for package php7 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %global apiver 20180731 %global zendver 20180731 +%global pearver 1.10.7 %define pkg_name php7 %define extension_dir %{_libdir}/%{pkg_name}/extensions %define peardir %{_datadir}/%{pkg_name}/PEAR -%define pearver 1.10.10 %define php_sysconf %{_sysconfdir}/%{pkg_name} %define build_firebird 0%{?is_opensuse} %define build_sodium 0 @@ -48,15 +48,12 @@ URL: https://secure.php.net Source0: https://secure.php.net/distributions/php-%{version}.tar.xz Source1: php-suse-addons.tar.bz2 -Source3: https://github.com/pear/pearweb_phars/raw/v%{pearver}/install-pear-nozlib.phar -Source4: README.SUSE-pear Source5: README.macros Source6: macros.php Source8: https://secure.php.net/distributions/php-%{version}.tar.xz.asc Source9: php7.keyring Source10: README.default_socket_timeout Source11: php7.rpmlintrc -Source12: https://github.com/pear/pearweb_phars/raw/v%{pearver}/install-pear-nozlib.sig#/install-pear-nozlib.phar.sig Source100: build-test.sh ## SUSE specific patches Patch0: php7-phpize.patch @@ -67,7 +64,6 @@ Patch6: php7-openssl.patch Patch7: php7-systzdata-v16.patch Patch8: php7-systemd-unit.patch -Patch9: php7-depdb-path.patch Patch10: php7-embed.patch ## Bugfix patches # following patch is to fix configure tests for crypt; the aim is to have php @@ -94,6 +90,7 @@ BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gmp-devel +BuildRequires: gpg2 BuildRequires: krb5-devel BuildRequires: libapparmor-devel BuildRequires: libbz2-devel @@ -246,8 +243,13 @@ Summary: PHP Extension and Application Repository Group: Development/Libraries/PHP Requires: %{name}-zlib = %{version} -Requires: php7-pear-Archive_Tar -Provides: php-pear = %{version} +Provides: php-pear = %{pearver} +Provides: php-pear(PEAR) = %{pearver} +%if 0%{?suse_version} <= 1330 +Provides: php7-pear-Archive_Tar +%else +Obsoletes: php7-pear-Archive_Tar +%endif Obsoletes: php5-pear BuildArch: noarch @@ -258,22 +260,6 @@ See https://pear.php.net/manual for more details. -%package pear-Archive_Tar -Summary: Tar file management class -Group: Productivity/Networking/Web/Servers -Requires: %{name}-pear = %{version} -Provides: php-pear-Archive_Tar = 1.4.4 -Provides: php5-pear-Archive_Tar = 1.4.4 -Obsoletes: php-pear-Archive_Tar < 1.4.4 -Obsoletes: php5-pear-Archive_Tar < 1.4.4 -BuildArch: noarch - -%description pear-Archive_Tar -This class provides handling of tar files in PHP. -It supports creating, listing, extracting and adding to tar files. -Gzip support is available if PHP has the zlib extension built-in orloaded. -Bz2 compression is also supported with the bz2 extension loaded. - %package -n apache2-mod_php7 Summary: PHP7 module for the Apache 2.x webserver Group: Productivity/Networking/Web/Servers @@ -976,8 +962,6 @@ %prep echo %{apache_mmn} %setup -q -n php-%{version} -a 1 -cp %{SOURCE3} pear -cp %{SOURCE4} pear/README.SUSE cp %{SOURCE5} . cp %{SOURCE10} . @@ -1008,6 +992,17 @@ : Update the zendver macro and rebuild. exit 1 fi +vpear=`sed -n 's/.*=>.*PEAR-\(.*\)\.tar.*/\1/p' pear/install-pear-nozlib.phar` +if test "x${vpear}" != "x%{pearver}"; then + : Error: Upstream PEAR version is now ${vpear}, expecting %{pearver}. + : Update the pearver macro and rebuild. + exit 1 +fi +if [ %{version} != '7.3.1' ]; then +echo 'check whether pcre.jit=0 workaround is still needed' +echo 'https://bugs.php.net/bug.php?id=77260' +exit 1 +fi %build # aclocal workaround - to be improved @@ -1051,8 +1046,6 @@ export EXTENSION_DIR export PHP_MYSQLND_ENABLED=yes export PHP_MYSQLND_COMPRESSION_SUPPORT=yes -# fix build-cli: libc-client.so needs -lssl -export IMAP_SHARED_LIBADD='-lssl' # Fix build-cli for %arm and aarch64 export LIBS=-ltinfo @@ -1275,6 +1268,9 @@ exit $exit_code %install +export PHP_PEAR_METADATA_DIR=%{peardir} +export PHP_PEAR_CACHE_DIR=%{_localstatedir}/cache/pear + # install function Install() { @@ -1335,8 +1331,8 @@ mv sapi/cgi/README.FastCGI README.FastCGI rm -rf %{buildroot}/{.channels,.depdb*,.filemap,.lock,usr/bin/peardev} install -dm 0755 %{buildroot}/%{peardir}/test -# for pear XML files -install -dm 0755 %{buildroot}%{_localstatedir}/lib/pear +# for pear cache and XML files +install -dm 0755 %{buildroot}%{_localstatedir}/{cache,lib}/pear # provide compat symlink mkdir -p %{buildroot}/srv/www/cgi-bin ln -s %{_bindir}/php-cgi %{buildroot}/srv/www/cgi-bin/php @@ -1346,22 +1342,6 @@ # bnc#734176 ln -s %{_bindir}/php %{buildroot}%{_bindir}/php7 ln -sf %{_bindir}/phar.phar %{buildroot}%{_bindir}/phar -# CVE-2014-5459, bnc#893849; couldn't find a way to use PHP_PEAR_CACHE_DIR -# (install-pear is checking if the directory is writable by current user?; -# unfortunately ENOTIME to figure out) -sed -i 's@15:"/tmp/pear/cache"@19:"%{_localstatedir}/cache/php-pear"@' %{buildroot}%{php_sysconf}/cli/pear.conf -grep -c '%{_localstatedir}/cache/php-pear' %{buildroot}%{php_sysconf}/cli/pear.conf || exit 1 -# after the update for php 5.6.15 landed in Tumbleweed, almost all PEAR -# packages building against broke. The metadata generated when building -# the PEAR package gets written to /.<meta> instead of -# /usr/share/php7/PEAR/.<meta>, probably caused by the new PEAR option -# "metadata_dir" that was added in PEAR 1.10.0. Our specs suspect the data -# to be in the peardir (where is normally belongs). -# This option is not set in the current php7 package, but maybe providing -# a default value for this would resolve the issue for the +100 packages. -pd=%{peardir} -sed -i "s@\"metadata_dir\";s:0:\"\"@\"metadata_dir\";s:${#pd}:\"${pd}\"@" %{buildroot}%{php_sysconf}/cli/pear.conf -grep -c "\"metadata_dir\";s:${#pd}:\"${pd}\"" %{buildroot}%{php_sysconf}/cli/pear.conf || exit 1 # Install the macros file: install -d %{buildroot}%{_sysconfdir}/rpm sed -e "s/@PHP_APIVER@/%{apiver}/;s/@PHP_ZENDVER@/%{zendver}/" < $RPM_SOURCE_DIR/macros.php > macros.php @@ -1369,12 +1349,6 @@ #install fpm init script. install -D -m 0644 ./build-fpm/sapi/fpm/php-fpm.service %{buildroot}%{_unitdir}/php-fpm.service ln -s service %{buildroot}%{_sbindir}/rcphp-fpm -# pear installer installs .depdb{,lock} files into %{buildroot}%{peardir} -# along with .lock, .registry when metadata_dir is not set but does not -# install them if metadata_dir is set; our Horde packages expect them there -# though, (they rm them without -f) so always install them along -cd %{buildroot}/%{peardir} -patch -p0 < %{PATCH9} %post -n apache2-mod_php7 #some distro versions does not have this tool. @@ -1422,11 +1396,7 @@ %files %defattr(-, root, root) -%if 0%{?suse_version} > 1320 -%license LICENSE -%else %license LICENSE -%endif %doc README* CODING_STANDARDS CREDITS EXTENSIONS NEWS UPGRADING %doc php-suse-addons/test.php5 %{_mandir}/man1/* @@ -1459,19 +1429,10 @@ %files pear %defattr(-, root, root) -%doc pear/README.SUSE %{_bindir}/pear %config(noreplace) %{php_sysconf}/cli/pear.conf %{peardir} -%exclude %{peardir}/Archive/Tar.php -%exclude %{peardir}/doc/Archive_Tar -%dir %{_localstatedir}/lib/pear - -%files pear-Archive_Tar -%defattr(-, root, root) -%dir %{peardir}/Archive -%{peardir}/Archive/Tar.php -%{peardir}/doc/Archive_Tar +%dir %{_localstatedir}/{cache,lib}/pear %files fastcgi %defattr(-, root, root) ++++++ php7-ini.patch ++++++ --- /var/tmp/diff_new_pack.zwnkLm/_old 2019-02-13 10:18:06.133341243 +0100 +++ /var/tmp/diff_new_pack.zwnkLm/_new 2019-02-13 10:18:06.133341243 +0100 @@ -1,7 +1,7 @@ -Index: php-7.3.0/php.ini-production +Index: php-7.3.1/php.ini-production =================================================================== ---- php-7.3.0.orig/php.ini-production 2018-12-04 17:12:20.000000000 +0100 -+++ php-7.3.0/php.ini-production 2018-12-10 09:56:52.609775323 +0100 +--- php-7.3.1.orig/php.ini-production 2019-01-08 14:55:52.000000000 +0100 ++++ php-7.3.1/php.ini-production 2019-02-07 09:28:59.154542260 +0100 @@ -729,7 +729,7 @@ default_charset = "UTF-8" ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -20,7 +20,15 @@ ; http://php.net/date.default-latitude ;date.default_latitude = 31.7667 -@@ -1154,7 +1154,7 @@ mysqli.max_persistent = -1 +@@ -1026,6 +1026,7 @@ cli_server.color = On + ; Enables or disables JIT compilation of patterns. This requires the PCRE + ; library to be compiled with JIT support. + ;pcre.jit=1 ++pcre.jit=0 + + [Pdo] + ; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" +@@ -1161,7 +1162,7 @@ mysqli.max_persistent = -1 ; Allow or prevent persistent links. ; http://php.net/mysqli.allow-persistent @@ -29,7 +37,7 @@ ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links -@@ -1347,7 +1347,7 @@ session.save_handler = files +@@ -1354,7 +1355,7 @@ session.save_handler = files ; where MODE is the octal representation of the mode. Note that this ; does not overwrite the process's umask. ; http://php.net/session.save-path ++++++ php7.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.zwnkLm/_old 2019-02-13 10:18:06.165341231 +0100 +++ /var/tmp/diff_new_pack.zwnkLm/_new 2019-02-13 10:18:06.165341231 +0100 @@ -2,3 +2,9 @@ # exact version of main package, parallel installation # not wanted addFilter("php.-embed.* shlib-policy-name-error") +# PHP5 is obsolete, replaced by PHP7 +addFilter("obsolete-not-provided php5-*") +# Channel files in metadata_dir +addFilter("hidden-file-or-dir /usr/share/php7/PEAR/.") +# Forgot to add category? +addFilter("non-standard-group Development/Libraries/PHP")
