rpms/php-composer-ca-bundle
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:main
rpms:f43
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:epel7
rpms:f33
rpms:f34
rpms:f35
rpms:f30
rpms:f31
rpms:f32
rpms:f29
rpms:f28
rpms:f27
rpms:f26
rpms:f25
rpms:f22
rpms:f23
rpms:f24
..
compare: rpms:f25
Branches Tags
rpms:main
rpms:rawhide
rpms:f43
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:epel7
rpms:f33
rpms:f34
rpms:f35
rpms:f30
rpms:f31
rpms:f32
rpms:f29
rpms:f28
rpms:f27
rpms:f26
rpms:f25
rpms:f22
rpms:f23
rpms:f24

No commits in common. "rawhide" and "f25" have entirely different histories.
rawhide ... f25

5 changed files with 57 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.gitignore vendored
View file

@ -1,27 +1,3 @@
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
/php-composer-ca-bundle-1.0.2-a2995e5.tgz
/php-composer-ca-bundle-1.0.3-5df9ed0.tgz
/php-composer-ca-bundle-1.0.4-ec21a59.tgz

9
php-composer-ca-bundle-autoload.php Normal file
View file

@ -0,0 +1,9 @@
<?php
/* Autoloader for composer/ca-bundle and its dependencies */
if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
}
\Fedora\Autoloader\Autoload::addPsr4('Composer\\CaBundle\\', __DIR__);

28
php-composer-ca-bundle-rpm.patch
View file

@ -1,24 +1,12 @@
diff -up ./src/CaBundle.php.rpm ./src/CaBundle.php
--- ./src/CaBundle.php.rpm 2021-01-12 13:54:38.000000000 +0100
+++ ./src/CaBundle.php 2021-01-12 13:55:35.957422992 +0100
@@ -125,7 +125,7 @@ class CaBundle
diff -up src/CaBundle.php.rpm src/CaBundle.php
--- src/CaBundle.php.rpm 2016-04-30 09:44:06.624946839 +0200
+++ src/CaBundle.php 2016-04-30 09:44:37.576088602 +0200
@@ -129,7 +129,7 @@ class CaBundle
*/
public static function getBundledCaBundlePath()
{
- $caBundleFile = __DIR__.'/../res/cacert.pem';
+ $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always
- return __DIR__.'/../res/cacert.pem';
+ return '/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
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
@@ -97,7 +97,7 @@ class CaBundleTest extends TestCase
public function testOpenBaseDir(): void
{
$oldValue = ini_get('open_basedir') ?: '';
- ini_set('open_basedir', dirname(__DIR__));
+ ini_set('open_basedir', '/usr/share/php:' . dirname(__DIR__));
$certFilePath = CaBundle::getSystemCaRootBundlePath();
$validResult = CaBundle::validateCaFile($certFilePath, null);
$this->assertTrue($validResult);
/**

279
php-composer-ca-bundle.spec
View file

@ -1,57 +1,52 @@
# 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 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%bcond_without tests
%global gh_commit 961a5e4056dd2e4a2eedcac7576075947c28bf63
%global gh_commit ec21a59414b99501e723b63fd664aa8ead9c5680
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner composer
%global gh_project ca-bundle
%global php_home %{_datadir}/php
%global with_tests 0%{!?_without_tests:1}
Name: php-composer-ca-bundle
Version: 1.5.10
Release: 1%{?dist}
Version: 1.0.4
Release: 2%{?dist}
Summary: Lets you find a path to the system CA
Group: Development/Libraries
License: MIT
URL: https://github.com/%{gh_owner}/%{gh_project}
# git snapshot to get everything, despite .gitattributes
Source0: %{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
Source2: %{name}-autoload.php
# Never bundle a CA file
Patch0: %{name}-rpm.patch
BuildArch: noarch
%if %{with tests}
BuildRequires: php(language) >= 7.2
%if %{with_tests}
# For tests
BuildRequires: php(language) >= 5.3.2
BuildRequires: php-openssl
BuildRequires: php-pcre
BuildRequires: php-cli
# From composer.json, "require": {
# "symfony/phpunit-bridge": "^8 || ^9",
# "phpstan/phpstan": "^1.10",
# "psr/log": "^1.0",
# "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
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": {
# "ext-openssl": "*",
# "ext-pcre": "*",
# "php": "^7.2 || ^8.0"
Requires: php(language) >= 7.2
# "php": "^5.3.2 || ^7.0"
Requires: php(language) >= 5.3.2
Requires: php-openssl
Requires: php-pcre
# From phpcompatinfo report for version 1.0.3
@ -59,7 +54,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}
@ -67,58 +62,50 @@ Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
%description
Small utility library that lets you find a path to the system CA bundle.
Autoloader: %{php_home}/Composer/CaBundle/autoload.php
%prep
%setup -q -n %{gh_project}-%{gh_commit}
%patch -P0 -p0 -b .rpm
cp %{SOURCE2} src/autoload.php
%patch0 -p0 -b .rpm
find src -name \*.rpm -exec rm {} \;
cat << 'EOF' | tee src/autoload.php
<?php
/* Autoloader for %{gh_owner}/%{gh_project} and its dependencies */
require_once '%{php_home}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('Composer\\CaBundle\\', __DIR__);
EOF
%build
# Empty build section, most likely nothing required.
%install
: Library
mkdir -p %{buildroot}%{php_home}/Composer/
cp -pr src %{buildroot}%{php_home}/Composer/CaBundle
%check
%if %{with tests}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php';
EOF
ret=0
%{_bindir}/phpunit10 --migrate-configuration
for cmd in php php81 php82 php83 php84 php85; do
if which $cmd; then
$cmd %{_bindir}/phpunit10 --no-coverage || ret=1
fi
done
exit $ret
%if %{with_tests}
php -r '
use Composer\CaBundle\CaBundle as CA;
require "%{buildroot}%{php_home}/Composer/CaBundle/autoload.php";
$file = CA::getSystemCaRootBundlePath();
if ($file != "/etc/pki/tls/certs/ca-bundle.crt") {
echo "Unexpected $file\n";
exit(1);
}
if (!CA::validateCaFile($file)) {
echo "Cannot validate $file\n";
exit(1);
}
echo "OK\n";
'
%else
: Test suite disabled
%endif
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc composer.json
%doc *.md
@ -127,200 +114,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
* Thu Mar 14 2024 Remi Collet <remi@remirepo.net> - 1.4.2-1
- update to 1.4.2 (no change)
* Mon Feb 26 2024 Remi Collet <remi@remirepo.net> - 1.4.1-1
- update to 1.4.1
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Remi Collet <remi@remirepo.net> - 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 <remi@remirepo.net> - 1.3.7-1
- update to 1.3.7 (no change)
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 8 2023 Remi Collet <remi@remirepo.net> - 1.3.6-1
- update to 1.3.6 (no change)
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jan 11 2023 Remi Collet <remi@remirepo.net> - 1.3.5-1
- update to 1.3.5 (no change)
* Wed Oct 12 2022 Remi Collet <remi@remirepo.net> - 1.3.4-1
- update to 1.3.4 (no change)
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jul 20 2022 Remi Collet <remi@remirepo.net> - 1.3.3-1
- update to 1.3.3 (no change)
* Wed May 25 2022 Remi Collet <remi@remirepo.net> - 1.3.2-1
- update to 1.3.2 (no change)
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 1.3.1-1
- update to 1.3.1
* Wed Oct 27 2021 Remi Collet <remi@remirepo.net> - 1.3.0-1
- update to 1.3.0
* Fri Oct 1 2021 Remi Collet <remi@remirepo.net> - 1.2.11-1
- update to 1.2.11 (no change)
- allow Symfony 6
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 8 2021 Remi Collet <remi@remirepo.net> - 1.2.10-1
- update to 1.2.10 (no change)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 12 2021 Remi Collet <remi@remirepo.net> - 1.2.9-1
- update to 1.2.9
* Mon Aug 24 2020 Remi Collet <remi@remirepo.net> - 1.2.8-1
- update to 1.2.8 (no change)
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Apr 8 2020 Remi Collet <remi@remirepo.net> - 1.2.7-1
- update to 1.2.7
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.2.6-1
- update to 1.2.6
* Thu Dec 12 2019 Remi Collet <remi@remirepo.net> - 1.2.5-1
- update to 1.2.5
* Sun Sep 1 2019 Remi Collet <remi@remirepo.net> - 1.2.4-1
- update to 1.2.4 (no change)
* Sat Aug 3 2019 Remi Collet <remi@remirepo.net> - 1.2.3-1
- update to 1.2.3
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 29 2019 Remi Collet <remi@remirepo.net> - 1.1.4-1
- update to 1.1.4 (no change)
* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 1.1.3-1
- update to 1.1.3 (no change)
* Thu Aug 9 2018 Remi Collet <remi@remirepo.net> - 1.1.2-1
- update to 1.1.2 (no change)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Mar 30 2018 Remi Collet <remi@remirepo.net> - 1.1.1-1
- update to 1.1.1 (no change)
- use range dependencies on F27+
- use phpunit6 on F27+
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 1.1.0-1
- Update to 1.1.0
- allow Symfony 2, 3 and 4
* Tue Nov 14 2017 Remi Collet <remi@remirepo.net> - 1.0.9-1
- Update to 1.0.9 (no change)
* Mon Sep 11 2017 Remi Collet <remi@remirepo.net> - 1.0.8-1
- Update to 1.0.8 (no change)
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Mar 6 2017 Remi Collet <remi@remirepo.net> - 1.0.7-1
- Update to 1.0.7
- run upstream test suite
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Nov 3 2016 Remi Collet <remi@fedoraproject.org> - 1.0.6-1
- update to 1.0.6 (no change)
* Wed Nov 2 2016 Remi Collet <remi@fedoraproject.org> - 1.0.5-1
- update to 1.0.5 (no change)
* Thu Oct 20 2016 Remi Collet <remi@fedoraproject.org> - 1.0.4-2
- switch from symfony/class-loader to fedora/autoloader

2
sources
View file

@ -1 +1 @@
SHA512 (php-composer-ca-bundle-1.5.10-961a5e4.tgz) = d92ccbfa70e5902f6e41d6906269515fc70aceb02967e4798774e746b468047aab236513cc3b260eb83b7cac2f2252e4e79b00b89ead52dbe3aaae1d33f4c16b
b866f011a791d48c1d28fb4eddd1dccd php-composer-ca-bundle-1.0.4-ec21a59.tgz