1 --- ca-certificates-20140223/sbin/update-ca-certificates~ 2014-03-14 12:55:24.000000000 +0200
2 +++ ca-certificates-20140223/sbin/update-ca-certificates 2014-03-14 14:38:31.587876211 +0200
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@
12 HOOKSDIR=/etc/ca-certificates/update.d
16 # Helper files. (Some of them are not simple arrays because we spawn
17 # subshells later on.)
18 -TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new"
19 +TEMPBUNDLE="${CERTBUNDLE}.new"
20 ADDED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
21 REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")"
27 - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \
28 + PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed -e 's/.crt$//' -e 's/ /_/g' \
31 if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
36 - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem"
37 + PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed 's/.crt$//').pem"
43 sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read -r crt
45 - if ! test -f "$CERTSDIR/$crt"
46 + if test -f "$CERTSDIR/$crt"
48 + add "$CERTSDIR/$crt"
49 + elif test -f "$LOCALCERTSDIR/$crt"
51 - echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
52 + add "$LOCALCERTSDIR/$crt"
54 + echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2
57 - add "$CERTSDIR/$crt"
60 -# Now process certificate authorities installed by the local system
62 -if [ -d "$LOCALCERTSDIR" ]
64 - find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read -r crt
70 ADDED_CNT=$(wc -l < "$ADDED")
71 REMOVED_CNT=$(wc -l < "$REMOVED")