diff --git a/.gitignore b/.gitignore index d6713cc..d000977 100644 --- a/.gitignore +++ b/.gitignore @@ -37,11 +37,3 @@ clog /php-phpseclib-2.0.37-c812fbb.tgz /php-phpseclib-2.0.38-b035365.tgz /php-phpseclib-2.0.39-f3a0e2b.tgz -/php-phpseclib-2.0.40-5ef6f83.tgz -/php-phpseclib-2.0.41-7e763c6.tgz -/php-phpseclib-2.0.42-665d289.tgz -/php-phpseclib-2.0.43-87b6bb4.tgz -/php-phpseclib-2.0.44-149f608.tgz -/php-phpseclib-2.0.48-eaa7be7.tgz -/php-phpseclib-2.0.49-4de468f.tgz -/php-phpseclib-2.0.50-1815ddd.tgz diff --git a/makesrc.sh b/makesrc.sh index 6e6d643..816b3f7 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -11,10 +11,11 @@ echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Vers echo "Cloning..." rm -rf $PROJECT-$COMMIT -git clone --revision "${COMMIT}" --depth 1 https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT -echo "Saving a copy of composer.json..." +echo "Getting commit..." pushd $PROJECT-$COMMIT +git checkout $COMMIT cp composer.json ../composer-$VERSION.json popd diff --git a/php-phpseclib.spec b/php-phpseclib.spec index 923468f..716b70d 100644 --- a/php-phpseclib.spec +++ b/php-phpseclib.spec @@ -3,12 +3,12 @@ %global github_owner phpseclib %global github_name phpseclib -%global github_commit 1815ddd00195487cc922577751c175f339f4e20f +%global github_commit f3a0e2b715c40cf1fd270d444901b63311725d63 %global github_short %(c=%{github_commit}; echo ${c:0:7}) %bcond_without tests Name: php-%{composer_vendor} -Version: 2.0.50 +Version: 2.0.39 Release: 1%{?dist} Summary: PHP Secure Communications Library License: MIT @@ -37,7 +37,6 @@ BuildRequires: %{_bindir}/phpab # Optional at runtime, to avoid too muck skipped tests BuildRequires: php-bcmath BuildRequires: php-gmp -BuildRequires: php-mcrypt %endif Requires: php(language) >= 5.3.3 @@ -45,7 +44,6 @@ Requires: php-bcmath Requires: php-date Requires: php-gmp Requires: php-hash -Requires: php-mcrypt Requires: php-openssl Requires: php-pcre Requires: php-session @@ -113,7 +111,7 @@ sed -e '/require /d' -i tests/Unit/Crypt/Hash/SHA*_96Test.php # testAuthorityInfoAccess fails without internet access ret=0 -for cmd in "php %{phpunit}" php80 php81 php82 php83 php84 php85; do +for cmd in "php %{phpunit}" php74 php80 php81 php82; do if which $cmd; then set $cmd $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ @@ -133,69 +131,18 @@ exit $ret %changelog -* Sat Jan 03 2026 Artur Frenszek-Iwicki - 2.0.50-1 -- Update to v2.0.50 - -* Mon Oct 06 2025 Artur Frenszek-Iwicki - 2.0.49-1 -- Update to v2.0.49 - -* Fri Jul 25 2025 Fedora Release Engineering - 2.0.48-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 30 2025 Artur Frenszek-Iwicki - 2.0.48-1 -- Update to v2.0.48 - -* Sat Jan 18 2025 Fedora Release Engineering - 2.0.44-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 2.0.44-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2.0.44-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.0.44-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 2.0.44-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Remi Collet - 2.0.44-1 -- update to 2.0.44 - -* Tue Jun 13 2023 Remi Collet - 2.0.43-1 -- update to 2.0.43 - -* Mon Mar 6 2023 Remi Collet - 2.0.42-1 -- update to 2.0.42 - -* Fri Jan 20 2023 Fedora Release Engineering - 2.0.41-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 3 2023 Remi Collet - 2.0.41-1 -- update to 2.0.41 - -* Mon Dec 19 2022 Remi Collet - 2.0.40-1 -- update to 2.0.40 - * Mon Oct 24 2022 Remi Collet - 2.0.39-1 - update to 2.0.39 * Mon Sep 12 2022 Remi Collet - 2.0.38-1 - update to 2.0.38 -* Fri Jul 22 2022 Fedora Release Engineering - 2.0.37-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - * Mon Apr 4 2022 Remi Collet - 2.0.37-1 - update to 2.0.37 * Mon Jan 31 2022 Remi Collet - 2.0.36-1 - update to 2.0.36 -* Fri Jan 21 2022 Fedora Release Engineering - 2.0.35-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Mon Nov 29 2021 Remi Collet - 2.0.35-1 - update to 2.0.35 diff --git a/sources b/sources index 1e006bc..382460a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpseclib-2.0.50-1815ddd.tgz) = cd7e28877120886af1b764ee5aba46f1d4f05f396d60f9fab45678c8a51a077690f61c24299aab5c239de0515ffcb34a91f533172a8d5f272840bc29ef3f5513 +SHA512 (php-phpseclib-2.0.39-f3a0e2b.tgz) = 423de695e328670742918ac6b036807f649a31e61c436640836b443f0f18fd659e31f53a60221d580b97f5882c9d8f9148b2f0579b046b0fa9fd010059b31f0c