]>
Commit | Line | Data |
---|---|---|
fba66a45 ER |
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 | |
4ab1fc5e JP |
3 | @@ -37,8 +37,8 @@ |
4 | default=0 | |
70208ba6 JR |
5 | CERTSCONF=/etc/ca-certificates.conf |
6 | CERTSDIR=/usr/share/ca-certificates | |
156426d3 | 7 | -LOCALCERTSDIR=/usr/local/share/ca-certificates |
2bf66f1a | 8 | -CERTBUNDLE=ca-certificates.crt |
70208ba6 | 9 | +LOCALCERTSDIR=/etc/certs |
2bf66f1a | 10 | +CERTBUNDLE=/etc/certs/ca-certificates.crt |
9af0daca | 11 | ETCCERTSDIR=@openssldir@ |
4ab1fc5e JP |
12 | HOOKSDIR=/etc/ca-certificates/update.d |
13 | ||
2bf66f1a JR |
14 | @@ -52,7 +52,7 @@ |
15 | ||
16 | # Helper files. (Some of them are not simple arrays because we spawn | |
17 | # subshells later on.) | |
de4dd2fd JP |
18 | -TEMPBUNDLE="${ETCCERTSDIR}/${CERTBUNDLE}.new" |
19 | +TEMPBUNDLE="${CERTBUNDLE}.new" | |
9c972891 JP |
20 | ADDED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")" |
21 | REMOVED="$(mktemp -p "${TMPDIR:-/tmp}" "ca-certificates.tmp.XXXXXX")" | |
2bf66f1a | 22 | |
156426d3 JR |
23 | @@ -62,7 +62,7 @@ |
24 | # bundle. | |
25 | add() { | |
26 | CERT="$1" | |
27 | - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt | sed -e 's/ /_/g' \ | |
eb5fdfa3 | 28 | + PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed -e 's/.crt$//' -e 's/ /_/g' \ |
156426d3 JR |
29 | -e 's/[()]/=/g' \ |
30 | -e 's/,/_/g').pem" | |
31 | if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] | |
32 | @@ -74,7 +74,7 @@ | |
33 | ||
34 | remove() { | |
35 | CERT="$1" | |
36 | - PEM="$ETCCERTSDIR/$(basename "$CERT" .crt).pem" | |
eb5fdfa3 | 37 | + PEM="$ETCCERTSDIR/$(basename "$CERT" .pem | sed 's/.crt$//').pem" |
156426d3 JR |
38 | if test -L "$PEM" |
39 | then | |
40 | rm -f "$PEM" | |
fba66a45 | 41 | @@ -111,24 +111,18 @@ |
156426d3 | 42 | |
1fc0c79c | 43 | sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read -r crt |
70208ba6 | 44 | do |
156426d3 JR |
45 | - if ! test -f "$CERTSDIR/$crt" |
46 | + if test -f "$CERTSDIR/$crt" | |
fba66a45 | 47 | + then |
156426d3 JR |
48 | + add "$CERTSDIR/$crt" |
49 | + elif test -f "$LOCALCERTSDIR/$crt" | |
fba66a45 ER |
50 | then |
51 | - echo "W: $CERTSDIR/$crt not found, but listed in $CERTSCONF." >&2 | |
156426d3 JR |
52 | + add "$LOCALCERTSDIR/$crt" |
53 | + else | |
156426d3 JR |
54 | + echo "W: $CERTSDIR/$crt or $LOCALCERTSDIR/$crt not found, but listed in $CERTSCONF." >&2 |
55 | continue | |
56 | fi | |
57 | - add "$CERTSDIR/$crt" | |
58 | done | |
59 | ||
60 | -# Now process certificate authorities installed by the local system | |
61 | -# administrator. | |
62 | -if [ -d "$LOCALCERTSDIR" ] | |
63 | -then | |
1fc0c79c | 64 | - find -L "$LOCALCERTSDIR" -type f -name '*.crt' | sort | while read -r crt |
156426d3 JR |
65 | - do |
66 | - add "$crt" | |
67 | - done | |
68 | -fi | |
69 | - | |
3dc5e4ea | 70 | ADDED_CNT=$(wc -l < "$ADDED") |
de4dd2fd JP |
71 | REMOVED_CNT=$(wc -l < "$REMOVED") |
72 |