diff options
| author | Remi Collet <remi@remirepo.net> | 2019-11-04 08:07:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-11-04 08:07:07 +0100 |
| commit | ada4e7be24857e3afbba6bdf8463347cfa734233 (patch) | |
| tree | 4f03384a2099b8c331661f33377cd86a1c69a3dd | |
| parent | 901285c50c6a7a062ba9835cbdf5eebc7ab3ab47 (diff) | |
| -rw-r--r-- | 1.patch | 22 | ||||
| -rw-r--r-- | php-horde-Horde-Crypt-Blowfish.spec | 13 |
2 files changed, 7 insertions, 28 deletions
diff --git a/1.patch b/1.patch deleted file mode 100644 index bd2e053..0000000 --- a/1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4b21f784621330b924f8a4693b7509047339fd30 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 1 Oct 2019 14:33:07 +0200 -Subject: [PATCH] Fix curly braces is deprecated - ---- - lib/Horde/Crypt/Blowfish/Php/Base.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Horde/Crypt/Blowfish/Php/Base.php b/lib/Horde/Crypt/Blowfish/Php/Base.php -index 1e212bf..3ee9235 100644 ---- a/lib/Horde/Crypt/Blowfish/Php/Base.php -+++ b/lib/Horde/Crypt/Blowfish/Php/Base.php -@@ -328,7 +328,7 @@ public function __construct($key) - for ($i = 0; $i < 18; ++$i) { - $data = 0; - for ($j = 4; $j > 0; --$j) { -- $data = $data << 8 | ord($key{$k}); -+ $data = $data << 8 | ord($key[$k]); - $k = ($k + 1) % $len; - } - $this->_P[$i] ^= $data; diff --git a/php-horde-Horde-Crypt-Blowfish.spec b/php-horde-Horde-Crypt-Blowfish.spec index 2d16e64..cb03334 100644 --- a/php-horde-Horde-Crypt-Blowfish.spec +++ b/php-horde-Horde-Crypt-Blowfish.spec @@ -11,16 +11,14 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Crypt-Blowfish -Version: 1.1.2 -Release: 9%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Blowfish Encryption Library License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Patch0: https://patch-diff.githubusercontent.com/raw/horde/Crypt_Blowfish/pull/1.patch - BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -61,7 +59,6 @@ Provides blowfish encryption/decryption for PHP string data. %prep %setup -q -c cd %{pear_name}-%{version} -%patch0 -p1 sed -e 's/md5sum="[^"]*"//' ../package.xml >%{name}.xml @@ -89,7 +86,7 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 for cmd in php php56 php70 php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose . || ret=1 + $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi done exit $ret @@ -117,6 +114,10 @@ fi %changelog +* Mon Nov 4 2019 Remi Collet <remi@remirepo.net> - 1.1.3-1 +- update to 1.1.3 +- drop patch merged upstream + * Tue Oct 1 2019 Remi Collet <remi@fedoraproject.org> - 1.1.2-9 - add patch for PHP 7.4 from https://github.com/horde/Crypt_Blowfish/pull/1 |