[arch-commits] Commit in ca-certificates/trunk (PKGBUILD ca-certificates.install)

Pierre Schmitz pierre at archlinux.org
Sat Oct 31 15:21:37 UTC 2009


    Date: Saturday, October 31, 2009 @ 11:21:37
  Author: pierre
Revision: 57439

try to cleanup on remove; make sure pacman installs the /etc/ssl/certs dir

Modified:
  ca-certificates/trunk/PKGBUILD
  ca-certificates/trunk/ca-certificates.install

-------------------------+
 PKGBUILD                |    5 +++--
 ca-certificates.install |   14 ++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-31 15:00:19 UTC (rev 57438)
+++ PKGBUILD	2009-10-31 15:21:37 UTC (rev 57439)
@@ -3,7 +3,7 @@
 
 pkgname=ca-certificates
 pkgver=20090814
-pkgrel=1
+pkgrel=2
 pkgdesc='Common CA certificates'
 arch=('any')
 url='http://packages.qa.debian.org/c/ca-certificates.html'
@@ -18,13 +18,14 @@
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
-	install -d -m755 $pkgdir/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates}}
+	install -d -m755 $pkgdir/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
 	install -D -m644 sbin/update-ca-certificates.8 $pkgdir/usr/share/man/man8/update-ca-certificates.8
 	make
 	make install DESTDIR=$pkgdir
 
 	(
 	echo "# Automatically generated by ${pkgname}-${pkgver}-${pkgrel}"
+	echo "# see update-ca-certificates man page"
 	echo "# "
 	cd $pkgdir/usr/share/ca-certificates
 	find . -name '*.crt' | sort | cut -b3-

Modified: ca-certificates.install
===================================================================
--- ca-certificates.install	2009-10-31 15:00:19 UTC (rev 57438)
+++ ca-certificates.install	2009-10-31 15:21:37 UTC (rev 57439)
@@ -5,3 +5,17 @@
 post_upgrade() {
 	usr/sbin/update-ca-certificates
 }
+
+pre_remove() {
+	# clean up certificates
+	local _backup=$(mktemp)
+	mv etc/ca-certificates.conf ${_backup}
+	echo > etc/ca-certificates.conf
+	usr/sbin/update-ca-certificates --fresh
+	mv ${_backup} etc/ca-certificates.conf
+}
+
+post_remove() {
+	# remove the cert file if it is empty
+	[[ -s etc/ssl/certs/ca-certificates.crt ]] || rm -f etc/ssl/certs/ca-certificates.crt
+}
\ No newline at end of file




More information about the arch-commits mailing list