1 --- ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:42:21.171246343 +0200
2 +++ ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:46:50.556014888 +0200
3 @@ -26,6 +26,7 @@ fresh=0
6 CERTSCONF=/etc/ca-certificates.conf
7 +CERTSCONFD=/etc/ca-certificates.d
8 CERTSDIR=/usr/share/ca-certificates
9 LOCALCERTSDIR=/etc/certs
10 CERTBUNDLE=/etc/certs/ca-certificates.crt
14 CERTSCONF=${DESTDIR}${CERTSCONF}
15 +CERTSCONFD=${DESTDIR}${CERTSCONFD}
16 CERTSDIR=${DESTDIR}${CERTSDIR}
17 LOCALCERTSDIR=${DESTDIR}${LOCALCERTSDIR}
18 CERTBUNDLE=${DESTDIR}${CERTBUNDLE}
21 echo -n "Updating certificates in $ETCCERTSDIR... "
23 -# Handle certificates that should be removed. This is an explicit act
24 -# by prefixing lines in the configuration files with exclamation marks (!).
25 -sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt
27 - remove "$CERTSDIR/$crt"
29 +for conf in $CERTSCONF $CERTSCONFD/*.conf; do
30 + # skip inexistent files (matched by glob)
31 + [ -f $conf ] || continue
33 + # Handle certificates that should be removed. This is an explicit act
34 + # by prefixing lines in the configuration files with exclamation marks (!).
35 + sed -n -e '/^$/d' -e 's/^!//p' $conf | while read crt
37 + remove "$CERTSDIR/$crt"
40 -sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt
42 - if test -f "$CERTSDIR/$crt"
44 - add "$CERTSDIR/$crt"
45 - elif test -f "$LOCALCERTSDIR/$crt"
47 - add "$LOCALCERTSDIR/$crt"
49 - echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
52 + sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $conf | while read crt
54 + if test -f "$CERTSDIR/$crt"
56 + add "$CERTSDIR/$crt"
57 + elif test -f "$LOCALCERTSDIR/$crt"
59 + add "$LOCALCERTSDIR/$crt"
61 + echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $conf." >&2