1 --- ca-certificates/sbin/update-ca-certificates 2008-11-01 18:39:19.000000000 +0100
2 +++ ca-certificates/sbin/update-ca-certificates-local 2008-11-01 19:17:39.138384960 +0100
5 CERTSCONF=/etc/ca-certificates.conf
6 CERTSDIR=/usr/share/ca-certificates
7 -LOCALCERTSDIR=/usr/local/share/ca-certificates
8 +LOCALCERTSDIR=/etc/certs
9 CERTBUNDLE=ca-certificates.crt
10 ETCCERTSDIR=/etc/openssl/certs
16 - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
17 + PEM="$ETCCERTSDIR/$(basename "$CERT" | sed -e 's/.crt$/.pem/' -e 's/ /_/g' \
20 if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
25 - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
26 + PEM="$ETCCERTSDIR/$(basename "$CERT" | sed 's/.crt$/.pem/')"
32 sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
34 - if ! test -f "$CERTSDIR/$crt"
35 + if test -f "$CERTSDIR/$crt"
37 + add "$CERTSDIR/$crt"
38 + elif test -f "$LOCALCERTSDIR/$crt"
40 + add "$LOCALCERTSDIR/$crt"
42 - echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
43 + echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
46 - add "$CERTSDIR/$crt"
49 -# Now process certificate authorities installed by the local system
51 -if [ -d "$LOCALCERTSDIR" ]
53 - find -L "$LOCALCERTSDIR" -type f -name '*.crt' | while read crt
59 chmod 0644 "$TEMPBUNDLE"
60 mv -f "$TEMPBUNDLE" "$CERTBUNDLE"