From 3a0fa2950f1e27e2e2829e39b2f570c0c1c93b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Kooman?= Date: Fri, 11 May 2018 10:58:28 +0200 Subject: [PATCH 1/3] update to 1.0.4 --- .gitignore | 1 + php-paragonie-constant-time-encoding.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b1544d..0420d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-paragonie-constant-time-encoding-d96e63b.tar.gz /php-paragonie-constant-time-encoding-6111a38.tar.gz /php-paragonie-constant-time-encoding-75e54b9.tar.gz +/php-paragonie-constant-time-encoding-2132f0f.tar.gz diff --git a/php-paragonie-constant-time-encoding.spec b/php-paragonie-constant-time-encoding.spec index de57149..bb8d0d0 100644 --- a/php-paragonie-constant-time-encoding.spec +++ b/php-paragonie-constant-time-encoding.spec @@ -5,12 +5,12 @@ %global github_owner paragonie %global github_name constant_time_encoding -%global commit0 75e54b9bc1d8eddc59bca721cd0f3d263c70503c +%global commit0 2132f0f293d856026d7d11bd81b9f4a23a1dc1f6 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: php-%{composer_vendor}-constant-time-encoding -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: Constant-Time Character Encoding in PHP Projects @@ -74,6 +74,9 @@ phpunit --no-coverage --verbose %license LICENSE.txt %changelog +* Fri May 11 2018 François Kooman - 1.0.4-1 +- update to 1.0.4 + * Mon Apr 30 2018 François Kooman - 1.0.3-1 - update to 1.0.3 diff --git a/sources b/sources index af11804..c9f21b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-paragonie-constant-time-encoding-75e54b9.tar.gz) = f13e4168dfaf1e34ae9d7c560f0814d0f4b6233ba49e9b3d714e55761340ce0c3e5a85d197bf67eb4b6edbd763a4f4f37f48ba6615609fca19236f1f95c98418 +SHA512 (php-paragonie-constant-time-encoding-2132f0f.tar.gz) = da6bf32743a02b783e5da596bdf7e78a8d2b81db89f2d9fb2cdbe5e65868134cfa2cd57464b765e3e64563f7be3322af316597c0d77fc5d129aa8dfeab2e8fa1 From 14630e40c88aac4a21e5d45acabb6803614a31c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Kooman?= Date: Mon, 20 Aug 2018 17:49:33 +0200 Subject: [PATCH 2/3] add patch to fix unit tests on EPEL --- ...7d9757207c72a3836d303242a74f747bfce3.patch | 32 +++++++++++++++++++ php-paragonie-constant-time-encoding.spec | 9 ++++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 840f7d9757207c72a3836d303242a74f747bfce3.patch diff --git a/840f7d9757207c72a3836d303242a74f747bfce3.patch b/840f7d9757207c72a3836d303242a74f747bfce3.patch new file mode 100644 index 0000000..ecd5c1b --- /dev/null +++ b/840f7d9757207c72a3836d303242a74f747bfce3.patch @@ -0,0 +1,32 @@ +From 840f7d9757207c72a3836d303242a74f747bfce3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Kooman?= +Date: Fri, 11 May 2018 11:22:21 +0200 +Subject: [PATCH] fix unit tests on older PHP versions by using non-namespaced + bools + +--- + src/Base32.php | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Base32.php b/src/Base32.php +index 4ede73a..265090f 100644 +--- a/src/Base32.php ++++ b/src/Base32.php +@@ -76,7 +76,7 @@ public static function encode($src) + */ + public static function encodeUnpadded($src) + { +- return static::doEncode($src, false, false); ++ return static::doEncode($src, \false, \false); + } + + /** +@@ -99,7 +99,7 @@ public static function encodeUpper($src) + */ + public static function encodeUpperUnpadded($src) + { +- return static::doEncode($src, true, false); ++ return static::doEncode($src, \true, \false); + } + + /** diff --git a/php-paragonie-constant-time-encoding.spec b/php-paragonie-constant-time-encoding.spec index bb8d0d0..c254a38 100644 --- a/php-paragonie-constant-time-encoding.spec +++ b/php-paragonie-constant-time-encoding.spec @@ -11,7 +11,7 @@ Name: php-%{composer_vendor}-constant-time-encoding Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Constant-Time Character Encoding in PHP Projects Group: System Environment/Libraries @@ -19,7 +19,8 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz - +# https://github.com/paragonie/constant_time_encoding/pull/16 +Patch0: 840f7d9757207c72a3836d303242a74f747bfce3.patch BuildArch: noarch BuildRequires: php(language) >= 5.3.0 @@ -45,6 +46,7 @@ misses. %prep %setup -n %{github_name}-%{commit0} +%patch0 -p1 %build cat <<'AUTOLOAD' | tee src/autoload.php @@ -74,6 +76,9 @@ phpunit --no-coverage --verbose %license LICENSE.txt %changelog +* Mon Aug 20 2018 François Kooman - 1.0.4-2 +- add patch to fix unit tests on EPEL + * Fri May 11 2018 François Kooman - 1.0.4-1 - update to 1.0.4 From 5906cc98ca077b122f6d6b3e3a018cced45fc518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Kooman?= Date: Thu, 3 Feb 2022 20:06:14 +0100 Subject: [PATCH 3/3] update to 1.1.0 --- .gitignore | 1 + ...7d9757207c72a3836d303242a74f747bfce3.patch | 32 ------------------- php-paragonie-constant-time-encoding.spec | 23 +++++++++---- sources | 2 +- 4 files changed, 19 insertions(+), 39 deletions(-) delete mode 100644 840f7d9757207c72a3836d303242a74f747bfce3.patch diff --git a/.gitignore b/.gitignore index 0420d2b..aefcf4f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-paragonie-constant-time-encoding-6111a38.tar.gz /php-paragonie-constant-time-encoding-75e54b9.tar.gz /php-paragonie-constant-time-encoding-2132f0f.tar.gz +/php-paragonie-constant-time-encoding-317718f.tar.gz diff --git a/840f7d9757207c72a3836d303242a74f747bfce3.patch b/840f7d9757207c72a3836d303242a74f747bfce3.patch deleted file mode 100644 index ecd5c1b..0000000 --- a/840f7d9757207c72a3836d303242a74f747bfce3.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 840f7d9757207c72a3836d303242a74f747bfce3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Kooman?= -Date: Fri, 11 May 2018 11:22:21 +0200 -Subject: [PATCH] fix unit tests on older PHP versions by using non-namespaced - bools - ---- - src/Base32.php | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Base32.php b/src/Base32.php -index 4ede73a..265090f 100644 ---- a/src/Base32.php -+++ b/src/Base32.php -@@ -76,7 +76,7 @@ public static function encode($src) - */ - public static function encodeUnpadded($src) - { -- return static::doEncode($src, false, false); -+ return static::doEncode($src, \false, \false); - } - - /** -@@ -99,7 +99,7 @@ public static function encodeUpper($src) - */ - public static function encodeUpperUnpadded($src) - { -- return static::doEncode($src, true, false); -+ return static::doEncode($src, \true, \false); - } - - /** diff --git a/php-paragonie-constant-time-encoding.spec b/php-paragonie-constant-time-encoding.spec index c254a38..f0b6762 100644 --- a/php-paragonie-constant-time-encoding.spec +++ b/php-paragonie-constant-time-encoding.spec @@ -5,13 +5,13 @@ %global github_owner paragonie %global github_name constant_time_encoding -%global commit0 2132f0f293d856026d7d11bd81b9f4a23a1dc1f6 +%global commit0 317718fb438e60151f72b20404f040cb5ae1d494 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: php-%{composer_vendor}-constant-time-encoding -Version: 1.0.4 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Constant-Time Character Encoding in PHP Projects Group: System Environment/Libraries @@ -19,10 +19,15 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz -# https://github.com/paragonie/constant_time_encoding/pull/16 -Patch0: 840f7d9757207c72a3836d303242a74f747bfce3.patch BuildArch: noarch +# "require": { +# "php": "^5.3|^7|^8" +# }, +# "require-dev": { +# "phpunit/phpunit": ">= 4", +# "paragonie/random_compat": "^1.4|^2" +# }, BuildRequires: php(language) >= 5.3.0 BuildRequires: php-mbstring BuildRequires: php-spl @@ -31,6 +36,9 @@ BuildRequires: php-composer(fedora/autoloader) BuildRequires: php-composer(paragonie/random_compat) BuildRequires: %{_bindir}/phpunit +# "require": { +# "php": "^5.3|^7|^8" +# }, Requires: php(language) >= 5.3.0 Requires: php-mbstring Requires: php-spl @@ -46,7 +54,6 @@ misses. %prep %setup -n %{github_name}-%{commit0} -%patch0 -p1 %build cat <<'AUTOLOAD' | tee src/autoload.php @@ -76,6 +83,10 @@ phpunit --no-coverage --verbose %license LICENSE.txt %changelog +* Thu Feb 03 2022 François Kooman - 1.1.0-1 +- update to 1.1.0 +- remove upstreamed patch (PR#16) + * Mon Aug 20 2018 François Kooman - 1.0.4-2 - add patch to fix unit tests on EPEL diff --git a/sources b/sources index c9f21b5..560cedd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-paragonie-constant-time-encoding-2132f0f.tar.gz) = da6bf32743a02b783e5da596bdf7e78a8d2b81db89f2d9fb2cdbe5e65868134cfa2cd57464b765e3e64563f7be3322af316597c0d77fc5d129aa8dfeab2e8fa1 +SHA512 (php-paragonie-constant-time-encoding-317718f.tar.gz) = 367a30584c46af56e39838cc8421c45e2d6f9123dbe5c571b68f69145eb594643595921dabfe8a591c0be3dac8a7db7d214c6664fe38cd0acb58106f3b1db67c