diff --git a/.gitignore b/.gitignore index ecc52e8..0420d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +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-eccf915.tar.gz -/php-paragonie-constant-time-encoding-55af0dc.tar.gz -/php-paragonie-constant-time-encoding-47a1ced.tar.gz -/php-paragonie-constant-time-encoding-f34c2b1.tar.gz -/php-paragonie-constant-time-encoding-2.5.0-9229e15.tgz -/php-paragonie-constant-time-encoding-2.6.1-d6e1d5d.tgz -/php-paragonie-constant-time-encoding-2.6.2-c1b1d82.tgz -/php-paragonie-constant-time-encoding-2.6.3-58c3f47.tgz -/php-paragonie-constant-time-encoding-2.8.0-ce27936.tgz -/php-paragonie-constant-time-encoding-2.8.2-e30811f.tgz +/php-paragonie-constant-time-encoding-2132f0f.tar.gz 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/makesrc.sh b/makesrc.sh deleted file mode 100644 index 8352783..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global github_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global commit0/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-paragonie-constant-time-encoding.spec b/php-paragonie-constant-time-encoding.spec index 3864b96..c254a38 100644 --- a/php-paragonie-constant-time-encoding.spec +++ b/php-paragonie-constant-time-encoding.spec @@ -5,59 +5,69 @@ %global github_owner paragonie %global github_name constant_time_encoding -%global commit0 e30811f7bc69e4b5b6d5783e712c06c8eabf0226 +%global commit0 2132f0f293d856026d7d11bd81b9f4a23a1dc1f6 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: php-%{composer_vendor}-constant-time-encoding -Version: 2.8.2 -Release: 1%{?dist} -Summary: Constant-time Implementations of RFC 4648 Encoding +Version: 1.0.4 +Release: 2%{?dist} +Summary: Constant-Time Character Encoding in PHP Projects +Group: System Environment/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} -Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{version}-%{shortcommit0}.tgz -Source1: makesrc.sh - +Source0: %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +# https://github.com/paragonie/constant_time_encoding/pull/16 +Patch0: 840f7d9757207c72a3836d303242a74f747bfce3.patch BuildArch: noarch -# "php": "^7|^8" -BuildRequires: php(language) >= 7 +BuildRequires: php(language) >= 5.3.0 BuildRequires: php-mbstring BuildRequires: php-spl -# "phpunit/phpunit": "^6|^7|^8|^9" -BuildRequires: phpunit9 -BuildRequires: php-fedora-autoloader-devel +BuildRequires: php-pcre +BuildRequires: php-composer(fedora/autoloader) +BuildRequires: php-composer(paragonie/random_compat) +BuildRequires: %{_bindir}/phpunit -# "php": "^7|^8" -Requires: php(language) >= 7 +Requires: php(language) >= 5.3.0 Requires: php-mbstring Requires: php-spl - -Suggests: php-sodium +Requires: php-composer(fedora/autoloader) Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} %description Based on the constant-time base64 implementation made by Steve "Sc00bz" -Thomas, this library aims to offer character encoding functions that do -not leak information about what you are encoding/decoding via processor -cache misses. +Thomas, this library aims to offer character encoding functions that do not +leak information about what you are encoding/decoding via processor cache +misses. %prep %setup -n %{github_name}-%{commit0} +%patch0 -p1 %build -%{_bindir}/phpab -t fedora -o src/autoload.php src +cat <<'AUTOLOAD' | tee src/autoload.php + - 2.8.2-1 -- update to 2.8.2 +* Mon Aug 20 2018 François Kooman - 1.0.4-2 +- add patch to fix unit tests on EPEL -* Tue Sep 23 2025 François Kooman - 2.8.0-1 -- update to 2.8.0 -- hard build dependency on PHPUnit 9 now -- add php-sodium extension as a suggestion - -* Fri Jul 25 2025 Fedora Release Engineering - 2.6.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 2.6.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 2.6.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2.6.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.6.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 2.6.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 2.6.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 2.6.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 14 2022 François Kooman - 2.6.3-1 -- update to 2.6.3 - -* Mon Jun 13 2022 François Kooman - 2.6.2-1 -- update to 2.6.2 (RHBZ#1494754) -- autoload required files for tests as well - -* Fri Jan 21 2022 Fedora Release Engineering - 2.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Jan 17 2022 François Kooman - 2.5.0-1 -- update to 2.5.0 -- add makesrc.sh to download source as upstream included .gitattributes to not - export tests - -* Fri Jul 23 2021 Fedora Release Engineering - 2.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Dec 10 2020 François Kooman - 2.4.0-2 -- support PHPUnit 8/9 for future PHP 8 support (patch by Remi Collet) - -* Mon Dec 7 2020 François Kooman - 2.4.0-1 -- update to 2.4.0 - -* Tue Jul 28 2020 Fedora Release Engineering - 2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 2.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Nov 06 2019 François Kooman - 2.3.0-1 -- update to 2.3.0 - -* Fri Jul 26 2019 Fedora Release Engineering - 2.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 15 2019 François Kooman - 2.2.3-1 -- update to 2.2.3 - -* Sat Feb 02 2019 Fedora Release Engineering - 2.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu May 03 2018 François Kooman - 2.2.2-4 -- also BuildRequire phpunit7 for future EL release - -* Thu May 03 2018 François Kooman - 2.2.2-3 -- simplify detection and use of PHPUnit 6 / PHPUnit 7 - -* Wed May 02 2018 François Kooman - 2.2.2-2 -- use Fedora template for generating autoloader -- match phpunit version with composer.json - -* Tue May 01 2018 François Kooman - 2.2.2-1 -- update to 2.2.2 for PHP >= 7 -- update dependencies -- switch to phpab autoload generator +* 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 aa26ef3..c9f21b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-paragonie-constant-time-encoding-2.8.2-e30811f.tgz) = 06ed2956086022e92f95b3b30e4222a3511de7cb22de038a92c080424443f7745528c8ab916b9848e06b1312711dc32415bbcf592008bd0026ac7413651e0291 +SHA512 (php-paragonie-constant-time-encoding-2132f0f.tar.gz) = da6bf32743a02b783e5da596bdf7e78a8d2b81db89f2d9fb2cdbe5e65868134cfa2cd57464b765e3e64563f7be3322af316597c0d77fc5d129aa8dfeab2e8fa1