diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-06 13:38:47 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-06 13:38:47 +0100 |
| commit | 210fbf59c5a9e60049851cb92bd1e663c1519af7 (patch) | |
| tree | ef81b986b6322ea1815e6bfdcac6b947d9fe9dd7 | |
| parent | a0f9037f00891115d859507c0470f8a6df098e56 (diff) | |
v2.31.12
| -rw-r--r-- | 6.patch | 22 | ||||
| -rw-r--r-- | php-horde-Horde-Core.spec | 13 |
2 files changed, 34 insertions, 1 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 514fc06..770c402 100644 --- a/php-horde-Horde-Core.spec +++ b/php-horde-Horde-Core.spec @@ -13,7 +13,7 @@ %global with_sysjs 0 Name: php-horde-Horde-Core -Version: 2.31.11 +Version: 2.31.12 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 @@ -344,6 +348,13 @@ fi %changelog +* 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 |