From 36d04721aa02f4bab7d1c42c07745d544d3d099b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 29 May 2015 11:11:23 +0200 Subject: [PATCH] ca-certificates: update our path for DESTDIR. --- .../update-ca-certificates-destdir.patch | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch index 9cb11a92c2..8c5cc1a978 100644 --- a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch +++ b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch @@ -1,11 +1,9 @@ -Use $DESTDIR to override some paths. - ---- sbin/update-ca-certificates.orig 2012-12-12 04:37:18.204915114 +0100 -+++ sbin/update-ca-certificates 2012-12-12 04:38:15.068574773 +0100 -@@ -37,11 +37,11 @@ do - shift - done - +--- sbin/update-ca-certificates.orig 2015-05-29 11:09:43.922158838 +0200 ++++ sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200 +@@ -24,12 +24,12 @@ + verbose=0 + fresh=0 + default=0 -CERTSCONF=/etc/ca-certificates.conf -CERTSDIR=/usr/share/ca-certificates -LOCALCERTSDIR=/usr/local/share/ca-certificates @@ -14,16 +12,9 @@ Use $DESTDIR to override some paths. +LOCALCERTSDIR=$DESTDIR/usr/local/share/ca-certificates CERTBUNDLE=ca-certificates.crt -ETCCERTSDIR=/etc/ssl/certs -+ETCCERTSDIR=$DESTDIR/etc/ssl/certs - - cleanup() { - rm -f "$TEMPBUNDLE" -@@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" - - echo "$ADDED_CNT added, $REMOVED_CNT removed; done." - -HOOKSDIR=/etc/ca-certificates/update.d ++ETCCERTSDIR=$DESTDIR/etc/ssl/certs +HOOKSDIR=$DESTDIR/etc/ca-certificates/update.d - echo -n "Running hooks in $HOOKSDIR...." - VERBOSE_ARG= - [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose + + while [ $# -gt 0 ]; + do