Compare commits
No commits in common. "rawhide" and "f40" have entirely different histories.
4 changed files with 12 additions and 67 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -15,13 +15,3 @@ clog
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -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/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always
|
||||
+ $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
|
||||
|
||||
// cURL does not understand 'phar://' paths
|
||||
// see https://github.com/composer/ca-bundle/issues/10
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
# remirepo/fedora spec file for php-composer-ca-bundle
|
||||
#
|
||||
# SPDX-FileCopyrightText: Copyright 2016-2025 Remi Collet
|
||||
# SPDX-License-Identifier: CECILL-2.1
|
||||
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
|
||||
# Copyright (c) 2016-2024 Remi Collet
|
||||
# License: CC-BY-SA-4.0
|
||||
# http://creativecommons.org/licenses/by-sa/4.0/
|
||||
#
|
||||
# Please, preserve the changelog entries
|
||||
#
|
||||
|
||||
%bcond_without tests
|
||||
|
||||
%global gh_commit 961a5e4056dd2e4a2eedcac7576075947c28bf63
|
||||
%global gh_commit 0c5ccfcfea312b5c5a190a21ac5cef93f74baf99
|
||||
%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.5.10
|
||||
Version: 1.5.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Lets you find a path to the system CA
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ BuildRequires: php-openssl
|
|||
BuildRequires: php-pcre
|
||||
BuildRequires: php-cli
|
||||
# From composer.json, "require": {
|
||||
# "symfony/phpunit-bridge": "^8 || ^9",
|
||||
# "symfony/phpunit-bridge": "^4.2 || ^5",
|
||||
# "phpstan/phpstan": "^1.10",
|
||||
# "psr/log": "^1.0",
|
||||
# "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
|
||||
|
|
@ -44,7 +44,7 @@ BuildRequires: phpunit10
|
|||
# Autoloader
|
||||
BuildRequires: php-composer(fedora/autoloader)
|
||||
# ca-certificates
|
||||
BuildRequires: %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
|
||||
BuildRequires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
|
||||
%endif
|
||||
|
||||
# From composer.json, "require": {
|
||||
|
|
@ -59,7 +59,7 @@ Requires: php-pcre
|
|||
# Autoloader
|
||||
Requires: php-composer(fedora/autoloader)
|
||||
# ca-certificates
|
||||
Requires: %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
|
||||
Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
|
||||
|
||||
Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ EOF
|
|||
ret=0
|
||||
%{_bindir}/phpunit10 --migrate-configuration
|
||||
|
||||
for cmd in php php81 php82 php83 php84 php85; do
|
||||
for cmd in php php81 php82 php83; do
|
||||
if which $cmd; then
|
||||
$cmd %{_bindir}/phpunit10 --no-coverage || ret=1
|
||||
fi
|
||||
|
|
@ -119,6 +119,7 @@ exit $ret
|
|||
|
||||
|
||||
%files
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license LICENSE
|
||||
%doc composer.json
|
||||
%doc *.md
|
||||
|
|
@ -127,52 +128,6 @@ exit $ret
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 9 2025 Remi Collet <remi@remirepo.net> - 1.5.10-1
|
||||
- update to 1.5.10 (no change)
|
||||
|
||||
* Thu Nov 6 2025 Remi Collet <remi@remirepo.net> - 1.5.9-1
|
||||
- update to 1.5.9 (no change)
|
||||
|
||||
* Thu Aug 28 2025 Remi Collet <remi@remirepo.net> - 1.5.8-1
|
||||
- update to 1.5.8
|
||||
|
||||
* Mon Jul 28 2025 Remi Collet <remi@remirepo.net> - 1.5.7-4
|
||||
- fix system certificates path rhbz#2383719
|
||||
|
||||
* Mon Jul 28 2025 Remi Collet <remi@remirepo.net> - 1.5.7-3
|
||||
- fix system certificates path rhbz#2383719
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Tue May 27 2025 Remi Collet <remi@remirepo.net> - 1.5.7-1
|
||||
- update to 1.5.7 (no change)
|
||||
|
||||
* Thu Mar 6 2025 Remi Collet <remi@remirepo.net> - 1.5.6-1
|
||||
- update to 1.5.6 (no change)
|
||||
|
||||
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Jan 9 2025 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 1.5.4-1
|
||||
- update to 1.5.4 (no change)
|
||||
|
||||
* Mon Nov 4 2024 Remi Collet <remi@remirepo.net> - 1.5.3-1
|
||||
- update to 1.5.3
|
||||
|
||||
* Wed Sep 25 2024 Remi Collet <remi@remirepo.net> - 1.5.2-1
|
||||
- update to 1.5.2 (no change)
|
||||
|
||||
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue Jul 9 2024 Remi Collet <remi@remirepo.net> - 1.5.1-1
|
||||
- update to 1.5.1 (no change)
|
||||
|
||||
* Fri Mar 15 2024 Remi Collet <remi@remirepo.net> - 1.5.0-1
|
||||
- update to 1.5.0
|
||||
- raise dependency on PHP 7.2
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (php-composer-ca-bundle-1.5.10-961a5e4.tgz) = d92ccbfa70e5902f6e41d6906269515fc70aceb02967e4798774e746b468047aab236513cc3b260eb83b7cac2f2252e4e79b00b89ead52dbe3aaae1d33f4c16b
|
||||
SHA512 (php-composer-ca-bundle-1.5.0-0c5ccfc.tgz) = e5df9626feffee1a3bab6389eb1b202deff4fa409162b26055a3fde31f79016dd2f0e9e4aca462770c496f40560c5cfbd0ae670b9953ce285ee0b9b5c802edad
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue