diff options
| -rw-r--r-- | 1.patch | 22 | ||||
| -rw-r--r-- | php-horde-Horde-Ldap.spec | 14 |
2 files changed, 7 insertions, 29 deletions
diff --git a/1.patch b/1.patch deleted file mode 100644 index 1062ced..0000000 --- a/1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 55de8c2b738eb052e5b240b8abc613ccd113203c Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 17 Oct 2019 16:22:31 +0200 -Subject: [PATCH] fix curly braces is deprecated - ---- - lib/Horde/Ldap/Filter.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Horde/Ldap/Filter.php b/lib/Horde/Ldap/Filter.php -index 4d4b4db..8124813 100644 ---- a/lib/Horde/Ldap/Filter.php -+++ b/lib/Horde/Ldap/Filter.php -@@ -350,7 +350,7 @@ protected static function _parseCombination($filter) - // is outside any subcomponent. - $level = 0; - for ($curpos = 0, $len = strlen($filter); $curpos < $len; $curpos++) { -- $cur_char = $filter{$curpos}; -+ $cur_char = $filter[$curpos]; - - // Rise/lower bracket level. - if ($cur_char == '(' && $prev_char != '\\') { diff --git a/php-horde-Horde-Ldap.spec b/php-horde-Horde-Ldap.spec index a1f5049..45fd419 100644 --- a/php-horde-Horde-Ldap.spec +++ b/php-horde-Horde-Ldap.spec @@ -11,16 +11,14 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Ldap -Version: 2.4.1 -Release: 6%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: Horde LDAP libraries License: LGPLv3 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/horde/Ldap/pull/1.patch - BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -64,9 +62,7 @@ objects. %prep %setup -q -c cd %{pear_name}-%{version} -%patch0 -p1 -b .pr1 -sed -e '/Filter.php/s/md5sum=.*name=/name=/' \ - ../package.xml >%{name}.xml +mv ../package.xml %{name}.xml %build @@ -118,6 +114,10 @@ fi %changelog +* Mon Nov 4 2019 Remi Collet <remi@remirepo.net> - 2.4.2-1 +- update to 2.4.2 +- drop patch merged upstream + * Thu Oct 17 2019 Remi Collet <remi@remirepo.net> - 2.4.1-6 - use range dependencies - add patch for PHP 7.4 from |