diff --git a/.gitignore b/.gitignore index ecc52e8..5aebac9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,3 @@ /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 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/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file diff --git a/php-paragonie-constant-time-encoding.spec b/php-paragonie-constant-time-encoding.spec index 3864b96..e879442 100644 --- a/php-paragonie-constant-time-encoding.spec +++ b/php-paragonie-constant-time-encoding.spec @@ -5,38 +5,42 @@ %global github_owner paragonie %global github_name constant_time_encoding -%global commit0 e30811f7bc69e4b5b6d5783e712c06c8eabf0226 +%global commit0 55af0dc01992b4d0da7f6372e2eac097bbbaffdb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: php-%{composer_vendor}-constant-time-encoding -Version: 2.8.2 -Release: 1%{?dist} +Version: 2.2.3 +Release: 2%{?dist} Summary: Constant-time Implementations of RFC 4648 Encoding 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 BuildArch: noarch -# "php": "^7|^8" +# "php": "^7" BuildRequires: php(language) >= 7 BuildRequires: php-mbstring BuildRequires: php-spl -# "phpunit/phpunit": "^6|^7|^8|^9" -BuildRequires: phpunit9 +# "phpunit/phpunit": "^6|^7", +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +BuildRequires: phpunit7 +%global phpunit %{_bindir}/phpunit7 +%else +BuildRequires: phpunit6 +%global phpunit %{_bindir}/phpunit6 +%endif + BuildRequires: php-fedora-autoloader-devel -# "php": "^7|^8" +# "php": "^7" Requires: php(language) >= 7 Requires: php-mbstring Requires: php-spl -Suggests: php-sodium - Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} %description @@ -56,8 +60,7 @@ mkdir -p %{buildroot}%{_datadir}/php/%{composer_namespace} cp -pr src/* %{buildroot}%{_datadir}/php/%{composer_namespace} %check -%{_bindir}/phpab -t fedora -o tests/autoload.php src tests -%{_bindir}/phpunit9 tests --verbose --bootstrap=tests/autoload.php +%{phpunit} tests --verbose --bootstrap=src/autoload.php %files %dir %{_datadir}/php/ParagonIE @@ -66,74 +69,6 @@ cp -pr src/* %{buildroot}%{_datadir}/php/%{composer_namespace} %license LICENSE.txt %changelog -* Wed Oct 01 2025 François Kooman - 2.8.2-1 -- update to 2.8.2 - -* 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 diff --git a/sources b/sources index aa26ef3..ddfdc1a 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-55af0dc.tar.gz) = 5ea6556ac1f67dcc311a010c7abd5c0701fbb0cc5d7810647fc66047ae58c1a825e7f5750ca3bf83131823a5144d826a90a19043e877b0ff917b045dc05795de