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

[Pierre Schmitz]

    Date: Saturday, October 31, 2009 @ 11:25:46
  Author: pierre
Revision: 57442

Merged revisions 57439 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/ca-certificates/trunk

........
  r57439 | pierre | 2009-10-31 16:21:37 +0100 (Sa, 31 Okt 2009) | 1 line
  
  try to cleanup on remove; make sure pacman installs the /etc/ssl/certs dir
........

Modified:
  ca-certificates/repos/testing-any/	(properties)
  ca-certificates/repos/testing-any/PKGBUILD
  ca-certificates/repos/testing-any/ca-certificates.install

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


Property changes on: ca-certificates/repos/testing-any
___________________________________________________________________
Modified: svnmerge-integrated
   - /ca-certificates/trunk:1-56391
   + /ca-certificates/trunk:1-57441

Modified: testing-any/PKGBUILD
===================================================================
--- testing-any/PKGBUILD	2009-10-31 15:23:50 UTC (rev 57441)
+++ testing-any/PKGBUILD	2009-10-31 15:25:46 UTC (rev 57442)
@@ -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: testing-any/ca-certificates.install
===================================================================
--- testing-any/ca-certificates.install	2009-10-31 15:23:50 UTC (rev 57441)
+++ testing-any/ca-certificates.install	2009-10-31 15:25:46 UTC (rev 57442)
@@ -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