Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Remi Collet
49bdfa6270 v1.2.7
(cherry picked from commit 89778a7db1)
(cherry picked from commit 8cb2feca9a)
2020-04-08 10:57:18 +02:00
Remi Collet
9711b9a24e v1.2.6
(cherry picked from commit 64fdb9f5da)
(cherry picked from commit 3cf9e41caf)
2020-01-14 09:48:40 +01:00
Remi Collet
b015339725 v1.2.3
(cherry picked from commit 2a16bf5ae2)
2019-08-19 14:41:51 +02:00
4 changed files with 38 additions and 11 deletions

5
.gitignore vendored
View file

@ -11,3 +11,8 @@
/php-composer-ca-bundle-1.1.2-46afded.tgz
/php-composer-ca-bundle-1.1.3-8afa52c.tgz
/php-composer-ca-bundle-1.1.4-558f321.tgz
/php-composer-ca-bundle-1.2.3-f26a67e.tgz
/php-composer-ca-bundle-1.2.4-10bb965.tgz
/php-composer-ca-bundle-1.2.5-62e8fc2.tgz
/php-composer-ca-bundle-1.2.6-47fe531.tgz
/php-composer-ca-bundle-1.2.7-95c63ab.tgz

View file

@ -10,3 +10,15 @@ diff -up src/CaBundle.php.rpm src/CaBundle.php
// 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 2019-08-01 11:14:21.577672699 +0200
+++ tests/CaBundleTest.php 2019-08-01 11:14:31.322744408 +0200
@@ -104,7 +104,7 @@ class CaBundleTest extends TestCase
public function testOpenBaseDir()
{
$oldValue = ini_get('open_basedir');
- ini_set('open_basedir', realpath(__DIR__ . '/../'));
+ ini_set('open_basedir', '/usr/share/php:' . realpath(__DIR__ . '/../'));
$certFilePath = CaBundle::getSystemCaRootBundlePath();
$validResult = CaBundle::validateCaFile($certFilePath, null);
$this->assertTrue($validResult);

View file

@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
%global gh_commit 558f321c52faeb4828c03e7dc0cfe39a09e09a2d
%global gh_commit 95c63ab2117a72f48f5a55da9740a3273d45b7fd
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner composer
%global gh_project ca-bundle
@ -14,8 +14,8 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-composer-ca-bundle
Version: 1.1.4
Release: 2%{?dist}
Version: 1.2.7
Release: 1%{?dist}
Summary: Lets you find a path to the system CA
License: MIT
@ -34,14 +34,14 @@ BuildRequires: php-openssl
BuildRequires: php-pcre
BuildRequires: php-cli
# From composer.json, "require": {
# "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
# "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
# "psr/log": "^1.0",
# "symfony/process": "^2.5 || ^3.0 || ^4.0"
# "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: phpunit6
%global phpunit %{_bindir}/phpunit6
%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) < 5)
BuildRequires: (php-composer(symfony/process) >= 2.5 with php-composer(symfony/process) < 6)
%else
BuildRequires: phpunit
%global phpunit %{_bindir}/phpunit
@ -57,7 +57,7 @@ BuildRequires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
# From composer.json, "require": {
# "ext-openssl": "*",
# "ext-pcre": "*",
# "php": "^5.3.2 || ^7.0"
# "php": "^5.3.2 || ^7.0 || ^8.0"
Requires: php(language) >= 5.3.2
Requires: php-openssl
Requires: php-pcre
@ -111,6 +111,7 @@ cat << 'EOF' | tee vendor/autoload.php
require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php';
\Fedora\Autoloader\Dependencies::required(array(
array(
'%{php_home}/Symfony5/Component/Process/autoload.php',
'%{php_home}/Symfony4/Component/Process/autoload.php',
'%{php_home}/Symfony3/Component/Process/autoload.php',
'%{php_home}/Symfony/Component/Process/autoload.php',
@ -120,10 +121,10 @@ require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php';
EOF
ret=0
for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72 php73; do
for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
$1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1
fi
done
exit $ret
@ -142,6 +143,15 @@ exit $ret
%changelog
* Wed Apr 8 2020 Remi Collet <remi@remirepo.net> - 1.2.7-1
- update to 1.2.7
* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.2.6-1
- update to 1.2.6
* Sat Aug 3 2019 Remi Collet <remi@remirepo.net> - 1.2.3-1
- update to 1.2.3
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (php-composer-ca-bundle-1.1.4-558f321.tgz) = 6192f3940105930bc6876f1b212684d47185816dcc328cf96c7d43cca68dfafad6a2c02fdea2c70334a571e690469d1f6a964096c68772512ed8639fbdde44f1
SHA512 (php-composer-ca-bundle-1.2.7-95c63ab.tgz) = 13d6de73d3a9370e8b5b478b1ab7dbfafc29ef2f2d1a0e705d74cdf6af3f979288805b0a98136db84c8131c993bf3baca91d875cb0d0c5a6181d548ee48ac3a9