[packages/php-composer-ca-bundle] up to 1.1.3; no changes for pld linux

glen glen at pld-linux.org
Mon Nov 5 00:44:23 CET 2018


commit 27017ff164b813d81b86ce5684bf8309c22cd832
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Nov 5 01:43:53 2018 +0200

    up to 1.1.3; no changes for pld linux

 php-composer-ca-bundle.spec |  4 ++--
 system-ca-certs.patch       | 25 +++++++++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/php-composer-ca-bundle.spec b/php-composer-ca-bundle.spec
index 59bdf58..7a6d846 100644
--- a/php-composer-ca-bundle.spec
+++ b/php-composer-ca-bundle.spec
@@ -3,12 +3,12 @@
 %include	/usr/lib/rpm/macros.php
 Summary:	Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle
 Name:		php-composer-%{pkgname}
-Version:	1.0.3
+Version:	1.1.3
 Release:	1
 License:	MIT
 Group:		Development/Languages/PHP
 Source0:	https://github.com/composer/ca-bundle/archive/%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5:	c00b86ac1f7126ca28c022789d500edf
+# Source0-md5:	a41ce10048e9893b5a744a6a757b838d
 URL:		https://github.com/composer/ca-bundle
 Patch0:		system-ca-certs.patch
 Requires:	ca-certificates >= 20141019-3
diff --git a/system-ca-certs.patch b/system-ca-certs.patch
index 81c05bc..cd9fbe3 100644
--- a/system-ca-certs.patch
+++ b/system-ca-certs.patch
@@ -1,10 +1,27 @@
---- ca-bundle-1.0.2/src/CaBundle.php~	2016-04-13 13:13:24.000000000 +0300
-+++ ca-bundle-1.0.2/src/CaBundle.php	2016-05-11 23:31:27.276340682 +0300
-@@ -129,7 +129,7 @@
+--- ca-bundle-1.1.3/src/CaBundle.php~	2018-10-18 09:09:13.000000000 +0300
++++ ca-bundle-1.1.3/src/CaBundle.php	2018-11-05 01:38:02.282995447 +0200
+@@ -130,24 +130,7 @@
       */
      public static function getBundledCaBundlePath()
      {
--        return __DIR__.'/../res/cacert.pem';
+-        $caBundleFile = __DIR__.'/../res/cacert.pem';
+-
+-        // cURL does not understand 'phar://' paths
+-        // see https://github.com/composer/ca-bundle/issues/10
+-        if (0 === strpos($caBundleFile, 'phar://')) {
+-            file_put_contents(
+-                $tempCaBundleFile = tempnam(sys_get_temp_dir(), 'openssl-ca-bundle-'),
+-                file_get_contents($caBundleFile)
+-            );
+-
+-            register_shutdown_function(function() use ($tempCaBundleFile) {
+-                @unlink($tempCaBundleFile);
+-            });
+-
+-            $caBundleFile = $tempCaBundleFile;
+-        }
+-
+-        return $caBundleFile;
 +        return '/etc/pki/tls/certs/ca-bundle.crt';
      }
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-composer-ca-bundle.git/commitdiff/27017ff164b813d81b86ce5684bf8309c22cd832



More information about the pld-cvs-commit mailing list