diff options
-rw-r--r-- | 6.patch | 22 | ||||
-rw-r--r-- | php-horde-Horde-Core.spec | 38 |
2 files changed, 57 insertions, 3 deletions
@@ -0,0 +1,22 @@ +From 9bed1cdc08787ae2087ce7d20425fe0503645fe7 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 18 Nov 2019 15:03:00 +0100 +Subject: [PATCH] Fix Trying to access array offset on value of type null + +--- + lib/Horde/Core/Tagger.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Horde/Core/Tagger.php b/lib/Horde/Core/Tagger.php +index c76306da..fd0d567f 100644 +--- a/lib/Horde/Core/Tagger.php ++++ b/lib/Horde/Core/Tagger.php +@@ -69,7 +69,7 @@ public function __construct() + $types = $injector->getInstance('Content_Types_Manager') + ->ensureTypes($this->_types); + foreach ($this->_types as $k => $v) { +- $this->_type_ids[$v] = intval($types[$k]); ++ $this->_type_ids[$v] = intval($types ? $types[$k] : 0); + } + $cache->set($key, serialize($this->_type_ids)); + } diff --git a/php-horde-Horde-Core.spec b/php-horde-Horde-Core.spec index 603f75f..3579442 100644 --- a/php-horde-Horde-Core.spec +++ b/php-horde-Horde-Core.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Core # -# Copyright (c) 2012-2019 Remi Collet +# Copyright (c) 2012-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -13,7 +13,7 @@ %global with_sysjs 0 Name: php-horde-Horde-Core -Version: 2.31.7 +Version: 2.31.16 Release: 1%{?dist} Summary: Horde Core Framework libraries @@ -21,6 +21,8 @@ License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/horde/Core/pull/6.patch + BuildArch: noarch BuildRequires: gettext BuildRequires: php(language) >= 5.3.0 @@ -246,6 +248,7 @@ Framework. %prep %setup -q -c cd %{pear_name}-%{version} +%patch0 -p1 -b .pr6 # Don't install .po and .pot files # Don't install prototype, scriptaculous, use system one @@ -256,6 +259,7 @@ sed -e '/%{pear_name}\.po/d' \ -e '/js\/scriptaculous/d' \ %endif -e '/%{pear_name}\.mo/s/md5sum=.*name=/name=/' \ + -e '/Tagger.php/s/md5sum=.*name=/name=/' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -294,7 +298,7 @@ done | tee ../%{pear_name}.lang cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 -for cmd in php php70 php71 php72 php73; do +for cmd in php php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi @@ -344,6 +348,34 @@ fi %changelog +* Mon Sep 7 2020 Remi Collet <remi@remirepo.net> - 2.31.16-1 +- update to 2.31.16 + +* Fri Aug 28 2020 Remi Collet <remi@remirepo.net> - 2.31.15-1 +- update to 2.31.15 + +* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 2.31.14-1 +- update to 2.31.14 + +* Thu Jan 2 2020 Remi Collet <remi@remirepo.net> - 2.31.13-1 +- update to 2.31.13 + +* Fri Dec 6 2019 Remi Collet <remi@remirepo.net> - 2.31.12-1 +- update to 2.31.12 + +* Mon Nov 18 2019 Remi Collet <remi@remirepo.net> - 2.31.11-2 +- fix koronolith FTBFS from Koschei using patch from + https://github.com/horde/Core/pull/6 + +* Mon Nov 4 2019 Remi Collet <remi@remirepo.net> - 2.31.11-1 +- update to 2.31.11 + +* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 2.31.10-1 +- update to 2.31.10 + +* Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 2.31.8-1 +- update to 2.31.8 + * Sun Jan 13 2019 Remi Collet <remi@remirepo.net> - 2.31.7-1 - update to 2.31.7 - use range dependencies |