]> git.pld-linux.org Git - packages/php-composer-ca-bundle.git/commitdiff
use system ca-certificates package auto/th/php-composer-ca-bundle-1.0.2-1
authorElan Ruusamäe <glen@delfi.ee>
Wed, 11 May 2016 20:32:53 +0000 (23:32 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Wed, 11 May 2016 20:33:52 +0000 (23:33 +0300)
patch from composer package
https://github.com/pld-linux/composer/commit/1004f8b6461ab761ba6954974969dc29f806a330

php-composer-ca-bundle.spec
system-ca-certs.patch [new file with mode: 0644]

index a6760bcf0431ada9f78bccd0b49ebf3b0ff58e3c..12f6df2499f5cd0ffe834ec1df1f91a101e595ea 100644 (file)
@@ -1,17 +1,17 @@
-# TODO
-# - system ca certs
 %define                php_min_version 5.3.2
 %define                pkgname ca-bundle
 %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.2
-Release:       0.1
+Release:       1
 License:       MIT
-Group:         Development/Libraries
+Group:         Development/Languages/PHP
 Source0:       https://github.com/composer/ca-bundle/archive/%{version}/%{pkgname}-%{version}.tar.gz
 # Source0-md5: 0e08430806fbcad13b8e568a854e5b4e
 URL:           https://github.com/composer/ca-bundle
+Patch0:                system-ca-certs.patch
+Requires:      ca-certificates >= 20141019-3
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(openssl)
 Requires:      php(pcre)
@@ -27,6 +27,7 @@ made available as a stand-alone library.
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/system-ca-certs.patch b/system-ca-certs.patch
new file mode 100644 (file)
index 0000000..81c05bc
--- /dev/null
@@ -0,0 +1,11 @@
+--- 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 @@
+      */
+     public static function getBundledCaBundlePath()
+     {
+-        return __DIR__.'/../res/cacert.pem';
++        return '/etc/pki/tls/certs/ca-bundle.crt';
+     }
+     /**
This page took 0.073978 seconds and 4 git commands to generate.