Date: Tuesday, March 7, 2017 @ 21:11:06
Author: heftig
Revision: 290107
20170307-1
Modified:
ca-certificates/trunk/PKGBUILD
ca-certificates/trunk/update-ca-trust
Deleted:
ca-certificates/trunk/ca-certificates-utils.install
-------------------------------+
PKGBUILD | 30 ++++++++++++++++--------------
ca-certificates-utils.install | 14 --------------
update-ca-trust | 20 ++++++++++++--------
3 files changed, 28 insertions(+), 36 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-03-07 21:05:26 UTC (rev 290106)
+++ PKGBUILD 2017-03-07 21:11:06 UTC (rev 290107)
@@ -4,15 +4,15 @@
pkgbase=ca-certificates
pkgname=(ca-certificates-utils ca-certificates)
-pkgver=20160507
+pkgver=20170307
pkgrel=1
-pkgdesc='Common CA certificates'
-arch=('any')
-url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git'
-license=('GPL2')
-makedepends=('asciidoc' 'p11-kit')
+pkgdesc="Common CA certificates"
+url="http://pkgs.fedoraproject.org/cgit/rpms/ca-certificates.git";
+arch=(any)
+license=(GPL2)
+makedepends=(asciidoc p11-kit)
source=(update-ca-trust update-ca-trust.8.txt update-ca-trust.hook)
-sha256sums=('746d2cce8ec107fa3b7aaa246d69a7e238c3d2ac5cd82c5aeed996fe9cb0a874'
+sha256sums=('857096d0cd82e0cb58622f8e427cec5eaa2d4e3ae32a3bb60c7292ceeabf9668'
'38c10446738c1e99bc95e42fe844a9e95ea106795059fa769f3b4ba82b395929'
'15eb04e757b7c61c8ee1540fd697771b8ae8e31f92cfb39c260b423101e21af8')
@@ -24,24 +24,26 @@
package_ca-certificates-utils() {
pkgdesc+=" (utilities)"
depends=('bash' 'coreutils' 'findutils' 'p11-kit>=0.23.1')
- install=ca-certificates-utils.install
provides=(ca-certificates ca-certificates-java)
conflicts=(ca-certificates-java)
replaces=(ca-certificates-java)
- install -D update-ca-trust "${pkgdir}/usr/bin/update-ca-trust"
- install -Dm644 update-ca-trust.8
"${pkgdir}/usr/share/man/man8/update-ca-trust.8"
- install -Dm644 update-ca-trust.hook
"${pkgdir}/usr/share/libalpm/hooks/update-ca-trust.hook"
+ install -D update-ca-trust "$pkgdir/usr/bin/update-ca-trust"
+ install -Dm644 update-ca-trust.8
"$pkgdir/usr/share/man/man8/update-ca-trust.8"
+ install -Dm644 update-ca-trust.hook
"$pkgdir/usr/share/libalpm/hooks/update-ca-trust.hook"
# Trust source directories
- install -d
"${pkgdir}"/{etc,usr/share}/${pkgbase}/trust-source/{anchors,blacklist}
+ install -d
"$pkgdir"/{etc,usr/share}/$pkgbase/trust-source/{anchors,blacklist}
# Directories used by update-ca-trust (aka "trust extract-compat")
- install -d "${pkgdir}"/etc/{ssl/certs/java,${pkgbase}/extracted}
+ install -d "$pkgdir"/etc/{ssl/certs/java,$pkgbase/extracted}
# Compatibility link for OpenSSL using /etc/ssl as CAdir
# Used in preference to the individual links in /etc/ssl/certs
- ln -s ../${pkgbase}/extracted/tls-ca-bundle.pem
"${pkgdir}/etc/ssl/cert.pem"
+ ln -sr "$pkgdir/etc/$pkgbase/extracted/tls-ca-bundle.pem"
"$pkgdir/etc/ssl/cert.pem"
+
+ # Compatiblity link for legacy bundle
+ ln -sr "$pkgdir/etc/$pkgbase/extracted/tls-ca-bundle.pem"
"$pkgdir/etc/ssl/certs/ca-certificates.crt"
}
package_ca-certificates() {
Deleted: ca-certificates-utils.install
===================================================================
--- ca-certificates-utils.install 2017-03-07 21:05:26 UTC (rev 290106)
+++ ca-certificates-utils.install 2017-03-07 21:11:06 UTC (rev 290107)
@@ -1,14 +0,0 @@
-export LC_ALL=C
-
-post_install() {
- # This should be a normally packaged file, but that would
- # require user intervention at upgrade
- ln -srf etc/ca-certificates/extracted/tls-ca-bundle.pem \
- etc/ssl/certs/ca-certificates.crt
-}
-
-pre_remove() {
- rm -f etc/ssl/certs/{ca-certificates.crt,java/cacerts}
-}
-
-# vim:set noet ts=8 sw=8 sts=0:
Modified: update-ca-trust
===================================================================
--- update-ca-trust 2017-03-07 21:05:26 UTC (rev 290106)
+++ update-ca-trust 2017-03-07 21:11:06 UTC (rev 290107)
@@ -1,18 +1,22 @@
#!/bin/bash
# At this time, while this script is trivial, we ignore any parameters given.
-# However, for backwards compatibility reasons, future versions of this script
must
-# support the syntax "update-ca-trust extract" trigger the generation of
output
+# However, for backwards compatibility reasons, future versions of this script
must
+# support the syntax "update-ca-trust extract" trigger the generation of output
# files in $DEST.
DEST=/etc/ca-certificates/extracted
+extract() {
+ trust extract --overwrite "$@"
+}
+
# The directory-format extractors remove all files in the target directory,
but not directories or files therein
-trust extract --overwrite --format=pem-directory-hash --filter=ca-anchors
--purpose server-auth $DEST/cadir
-trust extract --overwrite --format=pem-bundle --filter=ca-anchors
--purpose server-auth $DEST/tls-ca-bundle.pem
-trust extract --overwrite --format=pem-bundle --filter=ca-anchors
--purpose email $DEST/email-ca-bundle.pem
-trust extract --overwrite --format=pem-bundle --filter=ca-anchors
--purpose code-signing $DEST/objsign-ca-bundle.pem
-trust extract --overwrite --format=openssl-bundle --filter=certificates
$DEST/ca-bundle.trust.crt
+extract --format=pem-directory-hash --filter=ca-anchors
--purpose=server-auth $DEST/cadir
+extract --comment --format=pem-bundle --filter=ca-anchors
--purpose=server-auth $DEST/tls-ca-bundle.pem
+extract --comment --format=pem-bundle --filter=ca-anchors --purpose=email
$DEST/email-ca-bundle.pem
+extract --comment --format=pem-bundle --filter=ca-anchors
--purpose=code-signing $DEST/objsign-ca-bundle.pem
+extract --comment --format=openssl-bundle --filter=certificates
$DEST/ca-bundle.trust.crt
# We don't want to have to remove everything from the certs directory but
neither
# do we want to leave stale certs around, so symlink it all from somewhere else
@@ -24,4 +28,4 @@
find -L /etc/ssl/certs -maxdepth 1 -type l -delete
# Java bundle
-trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose
server-auth /etc/ssl/certs/java/cacerts
+extract --format=java-cacerts --filter=ca-anchors --purpose=server-auth
/etc/ssl/certs/java/cacerts
