1 Upstream-Status: Pending
3 From 724cb153ca0f607fb38b3a8db3ebb2742601cd81 Mon Sep 17 00:00:00 2001
4 From: Andreas Oberritter <obi@opendreambox.org>
5 Date: Tue, 19 Mar 2013 17:14:33 +0100
6 Subject: [PATCH 2/2] update-ca-certificates: use $SYSROOT
8 Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
10 sbin/update-ca-certificates | 14 +++++++-------
11 1 file changed, 7 insertions(+), 7 deletions(-)
13 Index: git/sbin/update-ca-certificates
14 ===================================================================
15 --- git.orig/sbin/update-ca-certificates
16 +++ git/sbin/update-ca-certificates
21 -CERTSCONF=/etc/ca-certificates.conf
22 -CERTSDIR=/usr/share/ca-certificates
23 -LOCALCERTSDIR=/usr/local/share/ca-certificates
24 +CERTSCONF=$SYSROOT/etc/ca-certificates.conf
25 +CERTSDIR=$SYSROOT/usr/share/ca-certificates
26 +LOCALCERTSDIR=$SYSROOT/usr/local/share/ca-certificates
27 CERTBUNDLE=ca-certificates.crt
28 -ETCCERTSDIR=/etc/ssl/certs
29 -HOOKSDIR=/etc/ca-certificates/update.d
30 +ETCCERTSDIR=$SYSROOT/etc/ssl/certs
31 +HOOKSDIR=$SYSROOT/etc/ca-certificates/update.d
35 @@ -92,9 +92,9 @@ add() {
36 PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
39 - if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
40 + if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "${CERT##$SYSROOT}" ]
42 - ln -sf "$CERT" "$PEM"
43 + ln -sf "${CERT##$SYSROOT}" "$PEM"
44 echo "+$PEM" >> "$ADDED"
46 # Add trailing newline to certificate, if it is missing (#635570)