From fa21f5102185bb1ef8bcb29e3619b8b58dc71884 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Fri, 5 Sep 2014 04:44:06 -0300
Subject: remove ca-certificates-utils because it will be the future
 ca-certificates package in the next release, ca-certificates will be a meta
 package to install ca-certificates-{mozilla,cacert}

---
 libre/ca-certificates-cacert/PKGBUILD              |  2 +-
 libre/ca-certificates-utils/PKGBUILD               | 35 ----------------------
 .../ca-certificates-utils.install                  | 18 -----------
 libre/ca-certificates-utils/confd.patch            | 28 -----------------
 4 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 libre/ca-certificates-utils/PKGBUILD
 delete mode 100644 libre/ca-certificates-utils/ca-certificates-utils.install
 delete mode 100644 libre/ca-certificates-utils/confd.patch

diff --git a/libre/ca-certificates-cacert/PKGBUILD b/libre/ca-certificates-cacert/PKGBUILD
index 9b36bd296..444cded6f 100644
--- a/libre/ca-certificates-cacert/PKGBUILD
+++ b/libre/ca-certificates-cacert/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="CAcert.org root certificates"
 arch=(any)
 url="https://www.cacert.org/index.php?id=3"
 license=('custom:RDL')
-depends=(ca-certificates-utils)
+depends=(ca-certificates)
 install=ca-certificates-cacert.install
 source=(CAcert.org_root.crt::http://www.cacert.org/certs/root.crt
         CAcert.org_class3.crt::http://www.cacert.org/certs/class3.crt
diff --git a/libre/ca-certificates-utils/PKGBUILD b/libre/ca-certificates-utils/PKGBUILD
deleted file mode 100644
index 8e502d92a..000000000
--- a/libre/ca-certificates-utils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 220624 2014-08-24 14:47:50Z heftig $
-# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=ca-certificates
-pkgname=ca-certificates-utils
-pkgver=20140325
-pkgrel=0.2.parabola1 # build with 0.x only and keep this package on [libre] temporally until which Arch official package be moved from [testing] to some stable repo
-pkgdesc='Common CA certificates (utilities)'
-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')
-backup=('etc/ca-certificates.conf')
-install=ca-certificates-utils.install
-provides=(ca-certificates)
-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() {
-	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"
-}
-
-# vim:set noet ts=8 sw=8:
diff --git a/libre/ca-certificates-utils/ca-certificates-utils.install b/libre/ca-certificates-utils/ca-certificates-utils.install
deleted file mode 100644
index 8e8a483ab..000000000
--- a/libre/ca-certificates-utils/ca-certificates-utils.install
+++ /dev/null
@@ -1,18 +0,0 @@
-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
-}
diff --git a/libre/ca-certificates-utils/confd.patch b/libre/ca-certificates-utils/confd.patch
deleted file mode 100644
index 4cf830170..000000000
--- a/libre/ca-certificates-utils/confd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.
-- 
cgit v1.2.3