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 -CERTBUNDLE=ca-certificates.crt
9 +LOCALCERTSDIR=/etc/certs
10 +CERTBUNDLE=/etc/certs/ca-certificates.crt
11 ETCCERTSDIR=@openssldir@
15 # Helper files. (Some of them are not simple arrays because we spawn
16 # subshells later on.)
17 -TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
18 +TEMPBUNDLE="$(mktemp "${CERTBUNDLE}.tmp.XXXXXX")"
19 ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
20 REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
26 - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
27 + PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed -e 's/.crt$//' -e 's/ /_/g' \
30 if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
35 - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
36 + PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed 's/.crt$//').pem"
42 case $(readlink $symlink) in
43 $CERTSDIR*) rm -f $symlink;;
44 + $LOCALCERTSDIR*) rm -f $symlink;;
47 find . -type l -print | while read symlink
50 sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
52 - if ! test -f "$CERTSDIR/$crt"
53 + if test -f "$CERTSDIR/$crt"
55 + add "$CERTSDIR/$crt"
56 + elif test -f "$LOCALCERTSDIR/$crt"
58 + add "$LOCALCERTSDIR/$crt"
60 - echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
61 + echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
64 - add "$CERTSDIR/$crt"
67 -# Now process certificate authorities installed by the local system
69 -if [ -d "$LOCALCERTSDIR" ]
71 - find -L "$LOCALCERTSDIR" -type f -name '*.crt' | while read crt
77 chmod 0644 "$TEMPBUNDLE"
78 mv -f "$TEMPBUNDLE" "$CERTBUNDLE"