From dffa065aaf3c223203767ed5c6c5153f522fc7a6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 28 May 2015 00:14:14 -0500
Subject: update ca-certificates

---
 package/ca-certificates/Makefile                   | 10 ++---
 .../patches/patch-sbin_update-ca-certificates      | 48 ----------------------
 2 files changed, 5 insertions(+), 53 deletions(-)
 delete mode 100644 package/ca-certificates/patches/patch-sbin_update-ca-certificates

(limited to 'package/ca-certificates')

diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index e33490ef1..5192ffa46 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -4,16 +4,16 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		ca-certificates
-PKG_VERSION:=		20090814
-PKG_RELEASE:=		3
-PKG_HASH:=		6924fafc35dd020da99bc86842f95f2a97a3a5ff084b0635eea815fe2777fc7c
+PKG_VERSION:=		20141019
+PKG_RELEASE:=		1
+PKG_HASH:=		684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86fcd1eb73a
 PKG_DESCR:=		collection of common ca certificates
 PKG_SECTION:=		app/crypto
 PKG_DEPENDS:=		openssl-util libopenssl
 PKG_URL:=		http://packages.debian.org/sid/ca-certificates
-PKG_SITES:=		http://ftp.debian.org/debian/pool/main/c/ca-certificates/
+PKG_SITES:=		http://http.debian.net/debian/pool/main/c/ca-certificates/
 
-DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).tar.xz
 
 PKG_FLAVOURS_CA_CERTS:=	SMALL
 PKGFD_SMALL:=		minimal set of CA certificates
diff --git a/package/ca-certificates/patches/patch-sbin_update-ca-certificates b/package/ca-certificates/patches/patch-sbin_update-ca-certificates
deleted file mode 100644
index dd6288366..000000000
--- a/package/ca-certificates/patches/patch-sbin_update-ca-certificates
+++ /dev/null
@@ -1,48 +0,0 @@
-	- prefix absolute paths with $DESTDIR
-	- subtract DESTDIR from the link name when linking
-	- add DESTDIR again when catting certs together (Yay.)
---- ca-certificates-20090814.orig/sbin/update-ca-certificates	2009-07-08 23:23:12.000000000 +0200
-+++ ca-certificates-20090814/sbin/update-ca-certificates	2009-08-22 21:10:24.210186675 +0200
-@@ -37,11 +37,11 @@ do
-   shift
- done
- 
--CERTSCONF=/etc/ca-certificates.conf
--CERTSDIR=/usr/share/ca-certificates
--LOCALCERTSDIR=/usr/local/share/ca-certificates
-+CERTSCONF=${DESTDIR}/etc/ca-certificates.conf
-+CERTSDIR=${DESTDIR}/usr/share/ca-certificates
-+LOCALCERTSDIR=${DESTDIR}/usr/local/share/ca-certificates
- CERTBUNDLE=ca-certificates.crt
--ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR=${DESTDIR}/etc/ssl/certs
- 
- cleanup() {
-   rm -f "$TEMPBUNDLE"
-@@ -60,7 +60,7 @@ REMOVED="$(mktemp -t "ca-certificates.tm
- # in /etc/ssl/certs to the certificate file and its inclusion into the
- # bundle.
- add() {
--  CERT="$1"
-+  CERT="${1##${DESTDIR}}"
-   PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
-                                                   -e 's/[()]/=/g' \
-                                                   -e 's/,/_/g').pem"
-@@ -69,7 +69,7 @@ add() {
-     ln -sf "$CERT" "$PEM"
-     echo +$PEM >> "$ADDED"
-   fi
--  cat "$CERT" >> "$TEMPBUNDLE"
-+  cat "${DESTDIR}/$CERT" >> "$TEMPBUNDLE"
- }
- 
- remove() {
-@@ -146,7 +146,7 @@ fi
- 
- echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
- 
--HOOKSDIR=/etc/ca-certificates/update.d
-+HOOKSDIR=${DESTDIR}/etc/ca-certificates/update.d
- echo -n "Running hooks in $HOOKSDIR...."
- VERBOSE_ARG=
- [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
-- 
cgit v1.2.3