diff --git a/srcpkgs/ca-certificates/INSTALL b/srcpkgs/ca-certificates/INSTALL index 2c69ad53d93..aa6ce6b26b4 100644 --- a/srcpkgs/ca-certificates/INSTALL +++ b/srcpkgs/ca-certificates/INSTALL @@ -3,6 +3,6 @@ post) [ ! -d etc/ca-certificates/update.d ] && \ install -d etc/ca-certificates/update.d [ ! -d etc/ssl/certs ] && install -d etc/ssl/certs - usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 + env DESTDIR=. usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 ;; esac diff --git a/srcpkgs/ca-certificates/REMOVE b/srcpkgs/ca-certificates/REMOVE index 85d123bd3a0..b20833ab9ad 100644 --- a/srcpkgs/ca-certificates/REMOVE +++ b/srcpkgs/ca-certificates/REMOVE @@ -4,7 +4,7 @@ pre) backup=etc/ca-certificates.conf.tmp mv etc/ca-certificates.conf $backup echo > etc/ca-certificates.conf - usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 + env DESTDIR=. usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 mv $backup etc/ca-certificates.conf ;; post) diff --git a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch new file mode 100644 index 00000000000..9cb11a92c29 --- /dev/null +++ b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch @@ -0,0 +1,29 @@ +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 + +-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" +@@ -148,7 +148,7 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" + + 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 diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 94aa319f003..4622a04b78a 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -1,7 +1,7 @@ # Template file for 'ca-certificates' pkgname=ca-certificates version=20121105 -revision=2 +revision=3 noarch=yes makedepends="python" fulldepends="openssl run-parts"