diff --git a/.gitignore b/.gitignore index 3e738e1..d7f2d0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,27 @@ clog /php-composer-ca-bundle-1.2.8-8a7ecad.tgz /php-composer-ca-bundle-1.2.9-78a0e28.tgz +/php-composer-ca-bundle-1.2.10-9fdb22c.tgz +/php-composer-ca-bundle-1.2.11-0b072d5.tgz +/php-composer-ca-bundle-1.3.0-6793336.tgz +/php-composer-ca-bundle-1.3.1-4c67918.tgz +/php-composer-ca-bundle-1.3.2-fd5dd44.tgz +/php-composer-ca-bundle-1.3.3-30897ed.tgz +/php-composer-ca-bundle-1.3.4-69098ec.tgz +/php-composer-ca-bundle-1.3.5-74780cc.tgz +/php-composer-ca-bundle-1.3.6-90d087e.tgz +/php-composer-ca-bundle-1.3.7-76e4633.tgz +/php-composer-ca-bundle-1.4.0-b66d11b.tgz +/php-composer-ca-bundle-1.4.1-3ce2401.tgz +/php-composer-ca-bundle-1.4.2-18fc0ab.tgz +/php-composer-ca-bundle-1.5.0-0c5ccfc.tgz +/php-composer-ca-bundle-1.5.1-063d9aa.tgz +/php-composer-ca-bundle-1.5.2-48a7928.tgz +/php-composer-ca-bundle-1.5.3-3b1fc3f.tgz +/php-composer-ca-bundle-1.5.4-bc05935.tgz +/php-composer-ca-bundle-1.5.5-08c50d5.tgz +/php-composer-ca-bundle-1.5.6-f65c239.tgz +/php-composer-ca-bundle-1.5.7-d665d22.tgz +/php-composer-ca-bundle-1.5.8-719026b.tgz +/php-composer-ca-bundle-1.5.9-1905981.tgz +/php-composer-ca-bundle-1.5.10-961a5e4.tgz diff --git a/php-composer-ca-bundle-rpm.patch b/php-composer-ca-bundle-rpm.patch index 9ff37d0..04bd4c1 100644 --- a/php-composer-ca-bundle-rpm.patch +++ b/php-composer-ca-bundle-rpm.patch @@ -6,15 +6,15 @@ diff -up ./src/CaBundle.php.rpm ./src/CaBundle.php public static function getBundledCaBundlePath() { - $caBundleFile = __DIR__.'/../res/cacert.pem'; -+ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always ++ $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always // cURL does not understand 'phar://' paths // see https://github.com/composer/ca-bundle/issues/10 diff -up ./tests/CaBundleTest.php.rpm ./tests/CaBundleTest.php --- ./tests/CaBundleTest.php.rpm 2021-01-12 13:55:35.957422992 +0100 +++ ./tests/CaBundleTest.php 2021-01-12 13:56:54.872069486 +0100 -@@ -124,7 +124,7 @@ class CaBundleTest extends TestCase - public function testOpenBaseDir() +@@ -97,7 +97,7 @@ class CaBundleTest extends TestCase + public function testOpenBaseDir(): void { $oldValue = ini_get('open_basedir') ?: ''; - ini_set('open_basedir', dirname(__DIR__)); diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index f94ff0f..0dc850a 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -1,23 +1,23 @@ # remirepo/fedora spec file for php-composer-ca-bundle # -# Copyright (c) 2016-2019 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2016-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests -%global gh_commit 78a0e288fdcebf92aa2318a8d3656168da6ac1a5 +%global gh_commit 961a5e4056dd2e4a2eedcac7576075947c28bf63 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner composer %global gh_project ca-bundle %global php_home %{_datadir}/php Name: php-composer-ca-bundle -Version: 1.2.9 -Release: 2%{?dist} +Version: 1.5.10 +Release: 1%{?dist} Summary: Lets you find a path to the system CA License: MIT @@ -31,37 +31,27 @@ Patch0: %{name}-rpm.patch BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 5.3.2 +BuildRequires: php(language) >= 7.2 BuildRequires: php-openssl BuildRequires: php-pcre BuildRequires: php-cli # From composer.json, "require": { -# "symfony/phpunit-bridge": "^4.2 || ^5", -# "phpstan/phpstan": "^0.12.55", +# "symfony/phpunit-bridge": "^8 || ^9", +# "phpstan/phpstan": "^1.10", # "psr/log": "^1.0", -# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: phpunit8 -%global phpunit %{_bindir}/phpunit8 -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 6) -%else -BuildRequires: phpunit -%global phpunit %{_bindir}/phpunit -BuildRequires: php-PsrLog -BuildRequires: php-symfony-process -%endif +# "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" +BuildRequires: phpunit10 # Autoloader BuildRequires: php-composer(fedora/autoloader) # ca-certificates -BuildRequires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +BuildRequires: %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem %endif # From composer.json, "require": { # "ext-openssl": "*", # "ext-pcre": "*", -# "php": "^5.3.2 || ^7.0 || ^8.0" -Requires: php(language) >= 5.3.2 +# "php": "^7.2 || ^8.0" +Requires: php(language) >= 7.2 Requires: php-openssl Requires: php-pcre # From phpcompatinfo report for version 1.0.3 @@ -69,7 +59,7 @@ Requires: php-pcre # Autoloader Requires: php-composer(fedora/autoloader) # ca-certificates -Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +Requires: %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} @@ -83,7 +73,7 @@ Autoloader: %{php_home}/Composer/CaBundle/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm find src -name \*.rpm -exec rm {} \; cat << 'EOF' | tee src/autoload.php @@ -112,22 +102,14 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 1.5.10-1 +- update to 1.5.10 (no change) + +* Thu Nov 6 2025 Remi Collet - 1.5.9-1 +- update to 1.5.9 (no change) + +* Thu Aug 28 2025 Remi Collet - 1.5.8-1 +- update to 1.5.8 + +* Mon Jul 28 2025 Remi Collet - 1.5.7-4 +- fix system certificates path rhbz#2383719 + +* Mon Jul 28 2025 Remi Collet - 1.5.7-3 +- fix system certificates path rhbz#2383719 + +* Fri Jul 25 2025 Fedora Release Engineering - 1.5.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue May 27 2025 Remi Collet - 1.5.7-1 +- update to 1.5.7 (no change) + +* Thu Mar 6 2025 Remi Collet - 1.5.6-1 +- update to 1.5.6 (no change) + +* Sat Jan 18 2025 Fedora Release Engineering - 1.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jan 9 2025 Remi Collet - 1.5.5-1 +- update to 1.5.5 (no change) +- re-license spec file to CECILL-2.1 + +* Thu Nov 28 2024 Remi Collet - 1.5.4-1 +- update to 1.5.4 (no change) + +* Mon Nov 4 2024 Remi Collet - 1.5.3-1 +- update to 1.5.3 + +* Wed Sep 25 2024 Remi Collet - 1.5.2-1 +- update to 1.5.2 (no change) + +* Fri Jul 19 2024 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 9 2024 Remi Collet - 1.5.1-1 +- update to 1.5.1 (no change) + +* Fri Mar 15 2024 Remi Collet - 1.5.0-1 +- update to 1.5.0 +- raise dependency on PHP 7.2 + +* Thu Mar 14 2024 Remi Collet - 1.4.2-1 +- update to 1.4.2 (no change) + +* Mon Feb 26 2024 Remi Collet - 1.4.1-1 +- update to 1.4.1 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 18 2023 Remi Collet - 1.4.0-1 +- update to 1.4.0 (no change) +- drop build dependencies on symfony/process and psr/log + +* Thu Aug 31 2023 Remi Collet - 1.3.7-1 +- update to 1.3.7 (no change) + +* Fri Jul 21 2023 Fedora Release Engineering - 1.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 8 2023 Remi Collet - 1.3.6-1 +- update to 1.3.6 (no change) + +* Fri Jan 20 2023 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jan 11 2023 Remi Collet - 1.3.5-1 +- update to 1.3.5 (no change) + +* Wed Oct 12 2022 Remi Collet - 1.3.4-1 +- update to 1.3.4 (no change) + +* Fri Jul 22 2022 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 20 2022 Remi Collet - 1.3.3-1 +- update to 1.3.3 (no change) + +* Wed May 25 2022 Remi Collet - 1.3.2-1 +- update to 1.3.2 (no change) + +* Fri Jan 21 2022 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Oct 30 2021 Remi Collet - 1.3.1-1 +- update to 1.3.1 + +* Wed Oct 27 2021 Remi Collet - 1.3.0-1 +- update to 1.3.0 + +* Fri Oct 1 2021 Remi Collet - 1.2.11-1 +- update to 1.2.11 (no change) +- allow Symfony 6 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 8 2021 Remi Collet - 1.2.10-1 +- update to 1.2.10 (no change) + * Wed Jan 27 2021 Fedora Release Engineering - 1.2.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 472a60d..48a494d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-ca-bundle-1.2.9-78a0e28.tgz) = 5caa252b07d3f3c591907ffee65b15f06574dee40a7fb7e2516394bb77b8d9484c55d8dcc272ab45a84b0f4f97fe0f9f02cf95a809646184747161ef176eb8f0 +SHA512 (php-composer-ca-bundle-1.5.10-961a5e4.tgz) = d92ccbfa70e5902f6e41d6906269515fc70aceb02967e4798774e746b468047aab236513cc3b260eb83b7cac2f2252e4e79b00b89ead52dbe3aaae1d33f4c16b