From 6beec557616ac190baa8c8678a45761aa5bb9524 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 2 Nov 2021 08:21:07 +0100
Subject: [PATCH] v1.3.1

(cherry picked from commit 1b544ef7cc9bdbdfd02565df80087a6ec615ecea)
---
 .gitignore                       |  5 +++++
 php-composer-ca-bundle-rpm.patch | 22 +++++++++++-----------
 php-composer-ca-bundle.spec      | 11 +++++++----
 sources                          |  2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f33ebad..0df8c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,8 @@
 /php-composer-ca-bundle-1.2.6-47fe531.tgz
 /php-composer-ca-bundle-1.2.7-95c63ab.tgz
 /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
diff --git a/php-composer-ca-bundle-rpm.patch b/php-composer-ca-bundle-rpm.patch
index 7ae8760..9ff37d0 100644
--- a/php-composer-ca-bundle-rpm.patch
+++ b/php-composer-ca-bundle-rpm.patch
@@ -1,7 +1,7 @@
-diff -up src/CaBundle.php.rpm src/CaBundle.php
---- src/CaBundle.php.rpm	2017-11-30 07:12:46.773928987 +0100
-+++ src/CaBundle.php	2017-11-30 07:15:28.549820032 +0100
-@@ -130,7 +130,7 @@ class CaBundle
+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
       */
      public static function getBundledCaBundlePath()
      {
@@ -10,15 +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
+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()
      {
-         $oldValue = ini_get('open_basedir');
--        ini_set('open_basedir', realpath(__DIR__ . '/../'));
-+        ini_set('open_basedir', '/usr/share/php:' . realpath(__DIR__ . '/../'));
+         $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);
diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec
index 79ff753..bf82801 100644
--- a/php-composer-ca-bundle.spec
+++ b/php-composer-ca-bundle.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-composer-ca-bundle
 #
-# Copyright (c) 2016-2019 Remi Collet
+# Copyright (c) 2016-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,14 +9,14 @@
 
 %bcond_without       tests
 
-%global gh_commit    8a7ecad675253e4654ea05505233285377405215
+%global gh_commit    4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b
 %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.8
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Lets you find a path to the system CA
 
@@ -40,7 +40,7 @@ BuildRequires:  php-cli
 #        "psr/log": "^1.0",
 #        "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  phpunit6
+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)
@@ -145,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 1.3.1-1
+- update to 1.3.1
+
 * Mon Aug 24 2020 Remi Collet <remi@remirepo.net> - 1.2.8-1
 - update to 1.2.8 (no change)
 
diff --git a/sources b/sources
index d565ae8..b08ea62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-composer-ca-bundle-1.2.8-8a7ecad.tgz) = e8fc25dabff81c91b761664518b76378856801c0cd755abd02ce7e4c221bbc3bffa4e50cf5922364e29a009f4d49d2bbee1f113916c91a34657b2eb963431f11
+SHA512 (php-composer-ca-bundle-1.3.1-4c67918.tgz) = d4e66c86d08b2f02d43e4b7a268852be5dd69de8c42558d63159dedc5b038825941db0f50ad804017ea631166cd8f6d6a963fdd1344a47396594ad6747587062