[arch-commits] Commit in ca-certificates/trunk (3 files)

[Jan Steffens]

    Date: Saturday, May 7, 2016 @ 03:06:41
  Author: heftig
Revision: 267080

20160507-1

Added:
  ca-certificates/trunk/update-ca-trust.hook
Modified:
  ca-certificates/trunk/PKGBUILD
  ca-certificates/trunk/ca-certificates-utils.install

-------------------------------+
 PKGBUILD                      |    8 +++++---
 ca-certificates-utils.install |   30 ------------------------------
 update-ca-trust.hook          |   11 +++++++++++
 3 files changed, 16 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-07 00:07:09 UTC (rev 267079)
+++ PKGBUILD	2016-05-07 01:06:41 UTC (rev 267080)
@@ -4,7 +4,7 @@
 
 pkgbase=ca-certificates
 pkgname=(ca-certificates-utils ca-certificates)
-pkgver=20150402
+pkgver=20160507
 pkgrel=1
 pkgdesc='Common CA certificates'
 arch=('any')
@@ -11,9 +11,10 @@
 url='http://pkgs.fedoraproject.org/cgit/ca-certificates.git'
 license=('GPL2')
 makedepends=('asciidoc' 'p11-kit')
-source=(update-ca-trust update-ca-trust.8.txt)
+source=(update-ca-trust update-ca-trust.8.txt update-ca-trust.hook)
 sha256sums=('746d2cce8ec107fa3b7aaa246d69a7e238c3d2ac5cd82c5aeed996fe9cb0a874'
-            '38c10446738c1e99bc95e42fe844a9e95ea106795059fa769f3b4ba82b395929')
+            '38c10446738c1e99bc95e42fe844a9e95ea106795059fa769f3b4ba82b395929'
+            '15eb04e757b7c61c8ee1540fd697771b8ae8e31f92cfb39c260b423101e21af8')
 
 build() {
 	asciidoc.py -v -d manpage -b docbook update-ca-trust.8.txt
@@ -30,6 +31,7 @@
 
 	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}

Modified: ca-certificates-utils.install
===================================================================
--- ca-certificates-utils.install	2016-05-07 00:07:09 UTC (rev 267079)
+++ ca-certificates-utils.install	2016-05-07 01:06:41 UTC (rev 267080)
@@ -1,8 +1,6 @@
 export LC_ALL=C
 
 post_install() {
-	usr/bin/update-ca-trust
-
 	# 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 \
@@ -9,35 +7,7 @@
 		etc/ssl/certs/ca-certificates.crt
 }
 
-post_upgrade() {
-	usr/bin/update-ca-trust
-
-	if (( $(vercmp $2 20140923-7.1) < 0 )); then
-		cat <<MSG
-  The way local CA certificates are handled has changed.
-  If you have added any certificates manually:
-
-  1. Move certificates from /usr/local/share/ca-certificates/
-     to /etc/ca-certificates/trust-source/anchors/
-  2. Do the same with root certificates added to /etc/ssl/certs/
-  3. Instead of \`update-ca-certificates\`, run \`trust extract-compat\`
-
-  Also see \`man 8 update-ca-trust\` and \`trust --help\`.
-MSG
-	fi
-
-	if (( $(vercmp $2 20150402) < 0 )); then
-		ln -srf etc/ca-certificates/extracted/tls-ca-bundle.pem \
-			etc/ssl/certs/ca-certificates.crt
-
-		# Moved to etc/ca-certificates/extracted
-		rm -f etc/ssl/certs/ca-bundle.trust.crt
-	fi
-}
-
 pre_remove() {
-	usr/bin/update-ca-trust
-
 	rm -f etc/ssl/certs/{ca-certificates.crt,java/cacerts}
 }
 

Added: update-ca-trust.hook
===================================================================
--- update-ca-trust.hook	                        (rev 0)
+++ update-ca-trust.hook	2016-05-07 01:06:41 UTC (rev 267080)
@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Type = File
+Target = usr/share/ca-certificates/trust-source/*
+
+[Action]
+Description = Rebuilding certificate stores...
+When = PostTransaction
+Exec = /usr/bin/update-ca-trust