commit php7-pear for openSUSE:Factory
Hello community, here is the log from the commit of package php7-pear for openSUSE:Factory checked in at 2020-05-26 17:13:47 Comparing /work/SRC/openSUSE:Factory/php7-pear (Old) and /work/SRC/openSUSE:Factory/.php7-pear.new.2738 (New) Package is "php7-pear" Tue May 26 17:13:47 2020 rev:6 rq:807459 version:1.10.19 Changes: --- /work/SRC/openSUSE:Factory/php7-pear/php7-pear.changes 2020-04-23 18:29:42.368003769 +0200 +++ /work/SRC/openSUSE:Factory/.php7-pear.new.2738/php7-pear.changes 2020-05-26 17:13:51.275265471 +0200 @@ -1,0 +2,6 @@ +Tue May 19 18:40:31 UTC 2020 - pgaj...@suse.com + +- provides and obsoletes php7-pear-Archive_Tar, former location + of PEAR/Archive/Tar.php + +--- Other differences: -- ++ php7-pear.spec ++ --- /var/tmp/diff_new_pack.i8Qelu/_old 2020-05-26 17:13:52.239267560 +0200 +++ /var/tmp/diff_new_pack.i8Qelu/_new 2020-05-26 17:13:52.239267560 +0200 @@ -42,6 +42,10 @@ Provides: php-pear(Structures_Graph) = %pear_module_version Structures_Graph Provides: php-pear(XML_Util) = %pear_module_version XML_Util Obsoletes: php-pear < %{version} +%if 0%{?suse_version} <= 1500 +Provides: php7-pear-Archive_Tar +Obsoletes: php7-pear-Archive_Tar +%endif BuildArch: noarch %description
commit php7-pear for openSUSE:Factory
Hello community, here is the log from the commit of package php7-pear for openSUSE:Factory checked in at 2020-04-23 18:29:39 Comparing /work/SRC/openSUSE:Factory/php7-pear (Old) and /work/SRC/openSUSE:Factory/.php7-pear.new.2738 (New) Package is "php7-pear" Thu Apr 23 18:29:39 2020 rev:5 rq:796092 version:1.10.19 Changes: --- /work/SRC/openSUSE:Factory/php7-pear/php7-pear.changes 2020-04-14 16:28:09.199952902 +0200 +++ /work/SRC/openSUSE:Factory/.php7-pear.new.2738/php7-pear.changes 2020-04-23 18:29:42.368003769 +0200 @@ -1,0 +2,9 @@ +Sun Apr 19 18:42:17 UTC 2020 - Arjen de Korte + +- Update to version 1.10.19 + - PEAR 1.10.12 +* adjust dependencies based on new releases + - XML_Util 1.4.5 +* fix Trying to access array offset on value of type int + +--- Other differences: -- ++ php7-pear.spec ++ --- /var/tmp/diff_new_pack.FLohHV/_old 2020-04-23 18:29:43.136005239 +0200 +++ /var/tmp/diff_new_pack.FLohHV/_new 2020-04-23 18:29:43.140005246 +0200 @@ -22,7 +22,7 @@ %define pear_module_version(m) %(sed -n 's/.*=>.*%{1}-\\(.*\\)\\.tar.*/\\1/p' %{SOURCE0}) Name: php7-pear -Version:1.10.18 +Version:1.10.19 Release:0 Summary:PHP Extension and Application Repository License:BSD-2-Clause ++ install-pear-nozlib.phar ++ 2965 lines (skipped) between install-pear-nozlib.phar and /work/SRC/openSUSE:Factory/.php7-pear.new.2738/install-pear-nozlib.phar ++ install-pear-nozlib.phar.sig ++ Binary files /var/tmp/diff_new_pack.FLohHV/_old and /var/tmp/diff_new_pack.FLohHV/_new differ
commit php7-pear for openSUSE:Factory
Hello community, here is the log from the commit of package php7-pear for openSUSE:Factory checked in at 2020-04-14 15:09:00 Comparing /work/SRC/openSUSE:Factory/php7-pear (Old) and /work/SRC/openSUSE:Factory/.php7-pear.new.2738 (New) Package is "php7-pear" Tue Apr 14 15:09:00 2020 rev:4 rq:792986 version:1.10.18 Changes: --- /work/SRC/openSUSE:Factory/php7-pear/php7-pear.changes 2020-03-03 10:14:18.154409812 +0100 +++ /work/SRC/openSUSE:Factory/.php7-pear.new.2738/php7-pear.changes 2020-04-14 16:28:09.199952902 +0200 @@ -1,0 +2,7 @@ +Fri Apr 10 20:17:07 UTC 2020 - Arjen de Korte + +- Update to version 1.10.18 +- Remove pear-cacheid-array-check.patch (upstreamed) +- Contents of .filemap are now sorted internally + +--- Old: pear-cacheid-array-check.patch Other differences: -- ++ php7-pear.spec ++ --- /var/tmp/diff_new_pack.H2Tq01/_old 2020-04-14 16:28:09.659953316 +0200 +++ /var/tmp/diff_new_pack.H2Tq01/_new 2020-04-14 16:28:09.659953316 +0200 @@ -22,7 +22,7 @@ %define pear_module_version(m) %(sed -n 's/.*=>.*%{1}-\\(.*\\)\\.tar.*/\\1/p' %{SOURCE0}) Name: php7-pear -Version:1.10.17 +Version:1.10.18 Release:0 Summary:PHP Extension and Application Repository License:BSD-2-Clause @@ -32,8 +32,6 @@ Source1: https://github.com/pear/pearweb_phars/raw/v%{version}/install-pear-nozlib.sig#/install-pear-nozlib.phar.sig Source2:%{name}.keyring Source3:%{name}.rpmlintrc -# PATCH-FIX-UPSTREAM https://bugs.php.net/78890 -Patch0: pear-cacheid-array-check.patch BuildRequires: php7 Requires: php7 Recommends: php7-openssl @@ -98,17 +96,6 @@ --metadata %{metadir} \ --www %{peardir}/htdocs -php -r '$filemap = unserialize(file_get_contents("%{buildroot}%{metadir}/.filemap")); - ksort($filemap); - foreach($filemap as &$value) { - ksort($value); - } - file_put_contents("%{buildroot}%{metadir}/.filemap", serialize($filemap));' - -pushd %{buildroot}%{peardir} -patch -p1 < %{PATCH0} -popd - %pre if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then mkdir -p %{metadir} ++ install-pear-nozlib.phar ++ 3207 lines (skipped) between install-pear-nozlib.phar and /work/SRC/openSUSE:Factory/.php7-pear.new.2738/install-pear-nozlib.phar ++ install-pear-nozlib.phar.sig ++ Binary files /var/tmp/diff_new_pack.H2Tq01/_old and /var/tmp/diff_new_pack.H2Tq01/_new differ
commit php7-pear for openSUSE:Factory
Hello community, here is the log from the commit of package php7-pear for openSUSE:Factory checked in at 2020-03-03 10:14:13 Comparing /work/SRC/openSUSE:Factory/php7-pear (Old) and /work/SRC/openSUSE:Factory/.php7-pear.new.26092 (New) Package is "php7-pear" Tue Mar 3 10:14:13 2020 rev:3 rq:780364 version:1.10.17 Changes: --- /work/SRC/openSUSE:Factory/php7-pear/php7-pear.changes 2019-12-09 21:34:37.838112159 +0100 +++ /work/SRC/openSUSE:Factory/.php7-pear.new.26092/php7-pear.changes 2020-03-03 10:14:18.154409812 +0100 @@ -1,0 +2,5 @@ +Fri Feb 28 08:33:14 UTC 2020 - Arjen de Korte + +- Sort contents of .filemap to make build reproducible + +--- Other differences: -- ++ php7-pear.spec ++ --- /var/tmp/diff_new_pack.xsdCjR/_old 2020-03-03 10:14:19.734413081 +0100 +++ /var/tmp/diff_new_pack.xsdCjR/_new 2020-03-03 10:14:19.734413081 +0100 @@ -1,7 +1,7 @@ # # spec file for package php7-pear # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -98,6 +98,13 @@ --metadata %{metadir} \ --www %{peardir}/htdocs +php -r '$filemap = unserialize(file_get_contents("%{buildroot}%{metadir}/.filemap")); + ksort($filemap); + foreach($filemap as &$value) { + ksort($value); + } + file_put_contents("%{buildroot}%{metadir}/.filemap", serialize($filemap));' + pushd %{buildroot}%{peardir} patch -p1 < %{PATCH0} popd
commit php7-pear for openSUSE:Factory
Hello community, here is the log from the commit of package php7-pear for openSUSE:Factory checked in at 2019-12-09 21:34:36 Comparing /work/SRC/openSUSE:Factory/php7-pear (Old) and /work/SRC/openSUSE:Factory/.php7-pear.new.4691 (New) Package is "php7-pear" Mon Dec 9 21:34:36 2019 rev:2 rq:755000 version:1.10.17 Changes: --- /work/SRC/openSUSE:Factory/php7-pear/php7-pear.changes 2019-12-02 11:36:58.950443525 +0100 +++ /work/SRC/openSUSE:Factory/.php7-pear.new.4691/php7-pear.changes 2019-12-09 21:34:37.838112159 +0100 @@ -1,0 +2,10 @@ +Sat Dec 7 22:57:56 UTC 2019 - Arjen de Korte + +- Apply upstream patch for https://bugs.php.net/78890 + + pear-cacheid-array-check.patch +- Recommend php7-openssl to allow https sources to be used +- Modify metadata_dir for system configuration only +- Add /var/lib/pear directory where xml files are stored +- Cleanup %files section + +--- New: pear-cacheid-array-check.patch Other differences: -- ++ php7-pear.spec ++ --- /var/tmp/diff_new_pack.kMeSY3/_old 2019-12-09 21:34:38.566111871 +0100 +++ /var/tmp/diff_new_pack.kMeSY3/_new 2019-12-09 21:34:38.566111871 +0100 @@ -32,15 +32,17 @@ Source1: https://github.com/pear/pearweb_phars/raw/v%{version}/install-pear-nozlib.sig#/install-pear-nozlib.phar.sig Source2:%{name}.keyring Source3:%{name}.rpmlintrc +# PATCH-FIX-UPSTREAM https://bugs.php.net/78890 +Patch0: pear-cacheid-array-check.patch BuildRequires: php7 -BuildRequires: php7-phar Requires: php7 +Recommends: php7-openssl +Provides: php-pear = %{version} Provides: php-pear(Archive_Tar) = %pear_module_version Archive_Tar Provides: php-pear(Console_Getopt) = %pear_module_version Console_Getopt Provides: php-pear(PEAR) = %pear_module_version PEAR Provides: php-pear(Structures_Graph) = %pear_module_version Structures_Graph Provides: php-pear(XML_Util) = %pear_module_version XML_Util -Provides: php-pear = %{version} Obsoletes: php-pear < %{version} BuildArch: noarch @@ -53,11 +55,12 @@ %package -n php7-pecl Summary:PHP Extension Community Library +Group: Development/Libraries/PHP Requires: autoconf Requires: automake Requires: gcc-c++ Requires: libtool -Requires: php-pear = %{version} +Requires: php7-pear = %{version} Provides: php-pecl = %{version} Obsoletes: php-pecl < %{version} Conflicts: php7-devel < 7.4 @@ -77,11 +80,13 @@ # Empty build section, nothing to build %install +export PHP_PEAR_INSTALL_DIR=%{peardir} +export PHP_PEAR_METADATA_DIR=%{metadir} export PHP_PEAR_SIG_BIN=%{_bindir}/gpg export PHP_PEAR_SYSCONF_DIR=%{_sysconfdir}/php7/cli export INSTALL_ROOT=%{buildroot} -install -d %{buildroot}%{_localstatedir}/cache/pear +install -d %{buildroot}%{_localstatedir}/{cache,lib}/pear php -d date.timezone=UTC -d memory_limit=64M -d short_open_tag=0 -d safe_mode=0 \ -d 'error_reporting=E_ALL&~E_DEPRECATED' -d detect_unicode=0 %{SOURCE0} \ @@ -93,7 +98,9 @@ --metadata %{metadir} \ --www %{peardir}/htdocs -rm -rf %{buildroot}/{.depdb,.depdblock} +pushd %{buildroot}%{peardir} +patch -p1 < %{PATCH0} +popd %pre if [ -d %{peardir}/.registry -a ! -d %{metadir}/.registry ]; then @@ -105,20 +112,20 @@ mdir=$(%{_bindir}/pear config-get metadata_dir system) if [ "${mdir}" != "%{metadir}" -a -d %{metadir}/.registry ]; then %{_bindir}/pear config-set metadata_dir %{metadir} system -%{_bindir}/pear config-set metadata_dir %{metadir} rm -rf %{peardir}/{.channels,.registry} fi %files %{_bindir}/pear %config(noreplace) %{_sysconfdir}/php7/cli/pear.conf +%dir %{_localstatedir}/cache/pear +%dir %{_localstatedir}/lib/pear %dir %{peardir} +%docdir %{peardir}/doc %{peardir}/* -%dir %{metadir} -%ghost %{metadir}/{.depdblock,.lock} %{metadir}/.??* -%dir %{_localstatedir}/cache/pear %exclude %{_bindir}/peardev +%exclude %{peardir}/doc/PEAR/INSTALL %exclude %{peardir}/test %files -n php7-pecl ++ pear-cacheid-array-check.patch ++ --- a/PEAR/REST.php +++ b/PEAR/REST.php @@ -178,7 +178,7 @@ $cachettl = $this->config->get('cache_ttl'); // If cache is newer than $cachettl seconds, we use the cache! -if (time() - $cacheid['age'] < $cachettl) { +if (is_array($cacheid) && time() - $cacheid['age'] < $cachettl) { return $this->getCache($url); } ++ php7-pear.rpmlintrc ++ --- /var/tmp/diff_new_pack.kMeSY3/_old 2019-12-09 21:34:38.618111852 +0100 +++ /var/tmp/diff_new_pack.kMeSY3/_new 2019-12-09 21:34:38.622111849 +0100