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

[Jan Steffens]

    Date: Sunday, August 24, 2014 @ 17:11:46
  Author: heftig
Revision: 220629

archrelease: copy trunk to testing-any

Added:
  ca-certificates/repos/testing-any/
  ca-certificates/repos/testing-any/PKGBUILD
    (from rev 220628, ca-certificates/trunk/PKGBUILD)
  ca-certificates/repos/testing-any/ca-certificates-utils.install
    (from rev 220628, ca-certificates/trunk/ca-certificates-utils.install)
  ca-certificates/repos/testing-any/confd.patch
    (from rev 220628, ca-certificates/trunk/confd.patch)

-------------------------------+
 PKGBUILD                      |   42 ++++++++++++++++++++++++++++++++++++++++
 ca-certificates-utils.install |   18 +++++++++++++++++
 confd.patch                   |   28 ++++++++++++++++++++++++++
 3 files changed, 88 insertions(+)

Copied: ca-certificates/repos/testing-any/PKGBUILD (from rev 220628, ca-certificates/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2014-08-24 15:11:46 UTC (rev 220629)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=ca-certificates
+pkgname=(ca-certificates-utils ca-certificates)
+pkgver=20140325
+pkgrel=2
+pkgdesc='Common CA certificates'
+arch=('any')
+url='http://packages.qa.debian.org/c/ca-certificates.html'
+license=('MPL' 'GPL')
+depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
+makedepends=('python2')
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgbase}/${pkgbase}_${pkgver}.tar.xz"
+	confd.patch)
+sha256sums=('c0e3d8c517995db2737f7f1a9b69d654b8823fa6d337871c6ce111fcf083454a'
+            '6a6efe688bd7f40dc57d07ad6bfdbb83f4853a1964c55e0620e833e6c2945dab')
+
+prepare() {
+	cd "${srcdir}/${pkgbase}"
+	patch -Np1 -i ../confd.patch
+}
+
+package_ca-certificates-utils() {
+	pkgdesc+=" (utilities)"
+	backup=('etc/ca-certificates.conf')
+	install=ca-certificates-utils.install
+	provides=(ca-certificates)
+
+	cd "${srcdir}/${pkgbase}"
+
+	install -d "${pkgdir}"/{etc/{ca-certificates/update.d,ssl/certs},usr/share/ca-certificates}
+	install -Dm644 sbin/update-ca-certificates.8 "${pkgdir}/usr/share/man/man8/update-ca-certificates.8"
+	install -D sbin/update-ca-certificates "${pkgdir}/usr/bin/update-ca-certificates"
+}
+
+package_ca-certificates() {
+	pkgdesc+=" (default providers)"
+	depends=(ca-certificates-{mozilla,cacert})
+}
+
+# vim:set noet ts=8 sw=8:

Copied: ca-certificates/repos/testing-any/ca-certificates-utils.install (from rev 220628, ca-certificates/trunk/ca-certificates-utils.install)
===================================================================
--- testing-any/ca-certificates-utils.install	                        (rev 0)
+++ testing-any/ca-certificates-utils.install	2014-08-24 15:11:46 UTC (rev 220629)
@@ -0,0 +1,18 @@
+export LC_ALL=C
+
+post_install() {
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+}
+
+post_upgrade() {
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+}
+
+pre_remove() {
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
+}
+
+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
+}

Copied: ca-certificates/repos/testing-any/confd.patch (from rev 220628, ca-certificates/trunk/confd.patch)
===================================================================
--- testing-any/confd.patch	                        (rev 0)
+++ testing-any/confd.patch	2014-08-24 15:11:46 UTC (rev 220629)
@@ -0,0 +1,28 @@
+diff -u -Nwr ca-certificates/sbin/update-ca-certificates ca-certificates.confd/sbin/update-ca-certificates
+--- ca-certificates/sbin/update-ca-certificates	2014-03-13 13:43:00.000000000 +0100
++++ ca-certificates.confd/sbin/update-ca-certificates	2014-08-24 13:36:19.264068119 +0200
+@@ -37,7 +37,7 @@
+   shift
+ done
+ 
+-CERTSCONF=/etc/ca-certificates.conf
++CERTSCONFS=/etc/ca-certificates/conf.d/*.conf
+ CERTSDIR=/usr/share/ca-certificates
+ LOCALCERTSDIR=/usr/local/share/ca-certificates
+ CERTBUNDLE=ca-certificates.crt
+@@ -101,6 +101,7 @@
+ 
+ echo -n "Updating certificates in $ETCCERTSDIR... "
+ 
++for CERTSCONF in $CERTSCONFS; do
+ # Handle certificates that should be removed.  This is an explicit act
+ # by prefixing lines in the configuration files with exclamation marks (!).
+ sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt
+@@ -117,6 +118,7 @@
+   fi
+   add "$CERTSDIR/$crt"
+ done
++done
+ 
+ # Now process certificate authorities installed by the local system
+ # administrator.