[arch-commits] Commit in ca-certificates/trunk (PKGBUILD update-ca-trust)

[Jan Steffens]

    Date: Friday, November 14, 2014 @ 10:57:06
  Author: heftig
Revision: 226222

Use "trust extract", which is actually documented in --help

Modified:
  ca-certificates/trunk/PKGBUILD
  ca-certificates/trunk/update-ca-trust

-----------------+
 PKGBUILD        |    4 ++--
 update-ca-trust |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-14 09:09:03 UTC (rev 226221)
+++ PKGBUILD	2014-11-14 09:57:06 UTC (rev 226222)
@@ -4,7 +4,7 @@
 pkgbase=ca-certificates
 pkgname=(ca-certificates-utils ca-certificates)
 pkgver=20140923
-pkgrel=4
+pkgrel=5
 pkgdesc='Common CA certificates'
 arch=('any')
 url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git'
@@ -12,7 +12,7 @@
 depends=('sh' 'p11-kit')
 makedepends=('asciidoc')
 source=(update-ca-trust update-ca-trust.8.txt)
-sha256sums=('c737236405320440665c9e7034585fde95d34495fc65789591a7ab76dc7568d5'
+sha256sums=('3387eb3e03088cfddc3fbb8cfacd3da0307f795a9387f31b69cd02764287399a'
             '52f7067ced3771bfa315e4b2a4d078ba0502b663ed4d87a9a18558e14d4ed99e')
 
 _confdir=/etc/$pkgbase

Modified: update-ca-trust
===================================================================
--- update-ca-trust	2014-11-14 09:09:03 UTC (rev 226221)
+++ update-ca-trust	2014-11-14 09:57:06 UTC (rev 226222)
@@ -11,12 +11,12 @@
 
 # OpenSSL PEM bundle that includes trust flags
 # (BEGIN TRUSTED CERTIFICATE)
-/usr/bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite $DEST/openssl/ca-bundle.trust.crt
-#/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth $DEST/pem/tls-ca-bundle.pem
-/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose email $DEST/pem/email-ca-bundle.pem
-/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
-#/usr/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
+trust extract --format=openssl-bundle --filter=certificates --overwrite $DEST/openssl/ca-bundle.trust.crt
+#trust extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth $DEST/pem/tls-ca-bundle.pem
+trust extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose email $DEST/pem/email-ca-bundle.pem
+trust extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
+#trust extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
 
 # Make upgrade on Arch smooth, by inverting some locations
-/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth /etc/ssl/certs/ca-certificates.crt
-/usr/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth /etc/ssl/certs/java/cacerts
+trust extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth /etc/ssl/certs/ca-certificates.crt
+trust extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth /etc/ssl/certs/java/cacerts