diff options
| -rw-r--r-- | php-composer-ca-bundle-rpm.patch | 2 | ||||
| -rw-r--r-- | php-composer-ca-bundle.spec | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/php-composer-ca-bundle-rpm.patch b/php-composer-ca-bundle-rpm.patch index 3dfdc65..04bd4c1 100644 --- a/php-composer-ca-bundle-rpm.patch +++ b/php-composer-ca-bundle-rpm.patch @@ -6,7 +6,7 @@ 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 --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec index b4499bc..132bd4c 100644 --- a/php-composer-ca-bundle.spec +++ b/php-composer-ca-bundle.spec @@ -17,7 +17,7 @@ Name: php-composer-ca-bundle Version: 1.5.7 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Lets you find a path to the system CA License: MIT @@ -44,7 +44,7 @@ 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": { @@ -107,7 +107,7 @@ EOF ret=0 %{_bindir}/phpunit10 --migrate-configuration -for cmd in php php81 php82 php83 php84; do +for cmd in php php81 php82 php83 php84 php85; do if which $cmd; then $cmd %{_bindir}/phpunit10 --no-coverage || ret=1 fi @@ -127,6 +127,9 @@ exit $ret %changelog +* Mon Jul 28 2025 Remi Collet <remi@remirepo.net> - 1.5.7-3 +- fix system certificates path rhbz#2383719 + * Tue May 27 2025 Remi Collet <remi@remirepo.net> - 1.5.7-1 - update to 1.5.7 (no change) |