From 48f14cc4f095c90129022fcd1d005d29d549f778 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:40:14 -0600
Subject: ca-certificates 20130906 refs #961

---
 abs/core/ca-certificates/PKGBUILD                | 17 +++++++++++------
 abs/core/ca-certificates/ca-certificates.install |  6 +++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/abs/core/ca-certificates/PKGBUILD b/abs/core/ca-certificates/PKGBUILD
index 4b35562..7409989 100644
--- a/abs/core/ca-certificates/PKGBUILD
+++ b/abs/core/ca-certificates/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162841 2012-07-01 11:43:58Z pierre $
+# $Id: PKGBUILD 195211 2013-09-27 20:33:15Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=ca-certificates
-pkgver=20120623
+pkgver=20130906
 pkgrel=1
 pkgdesc='Common CA certificates'
 arch=('any')
@@ -13,19 +13,24 @@ depends=('bash' 'run-parts' 'openssl' 'findutils' 'coreutils' 'sed')
 makedepends=('python2')
 install='ca-certificates.install'
 backup=('etc/ca-certificates.conf')
-sha256sums=('878cd1130ba056fe5f96decde7e5fc1b71d35eb8565a1515744912e100731ee9')
+sha256sums=('dd10520091d469e95e11e5fafb7422d3be0a66071984d09009ed3e0232cb277d')
 
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+prepare() {
+	cd ${srcdir}/${pkgname}
 	sed 's|/usr/bin/python|/usr/bin/python2|g' -i mozilla/certdata2pem.py
 	sed 's|python|python2|g' -i mozilla/Makefile
+}
+
+build() {
+	cd ${srcdir}/${pkgname}
 	make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+	cd ${srcdir}/${pkgname}
 	install -d -m755 ${pkgdir}/{etc/ca-certificates/update.d,usr/{sbin,share/ca-certificates},etc/ssl/certs}
 	make install DESTDIR=${pkgdir}
+	mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
 	install -D -m644 sbin/update-ca-certificates.8 ${pkgdir}/usr/share/man/man8/update-ca-certificates.8
 
 	(
diff --git a/abs/core/ca-certificates/ca-certificates.install b/abs/core/ca-certificates/ca-certificates.install
index 3d8b87d..4e90c2e 100644
--- a/abs/core/ca-certificates/ca-certificates.install
+++ b/abs/core/ca-certificates/ca-certificates.install
@@ -1,14 +1,14 @@
 export LC_ALL=C
 
 post_install() {
-	usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
 }
 
 post_upgrade() {
 	if [ $(vercmp $2 20110421-1) -lt 0 ]; then
 		echo 'Updating certificates. This might take a while...'
 	fi
-	usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
 }
 
 pre_remove() {
@@ -16,7 +16,7 @@ pre_remove() {
 	local _backup=$(mktemp)
 	mv etc/ca-certificates.conf ${_backup}
 	echo > etc/ca-certificates.conf
-	usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1
+	usr/bin/update-ca-certificates --fresh >/dev/null 2>&1
 	mv ${_backup} etc/ca-certificates.conf
 }
 
-- 
cgit v0.12

