]>
Commit | Line | Data |
---|---|---|
98dc7c4a ER |
1 | --- ca-certificates-undebianize/sbin/update-ca-certificates 2008-11-01 12:17:37.000000000 +0100 |
2 | +++ ca-certificates-20090814/sbin/update-ca-certificates 2010-05-05 14:03:33.683398895 +0300 | |
9c631836 | 3 | @@ -38,7 +38,7 @@ |
9c631836 | 4 | CERTSDIR=/usr/share/ca-certificates |
156426d3 | 5 | LOCALCERTSDIR=/usr/local/share/ca-certificates |
df159834 | 6 | CERTBUNDLE=ca-certificates.crt |
9c631836 | 7 | -ETCCERTSDIR=/etc/ssl/certs |
9af0daca | 8 | +ETCCERTSDIR=@openssldir@ |
156426d3 JR |
9 | |
10 | cleanup() { | |
11 | rm -f "$TEMPBUNDLE" | |
98dc7c4a ER |
12 | @@ -57,7 +57,7 @@ |
13 | REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")" | |
14 | ||
15 | # Adds a certificate to the list of trusted ones. This includes a symlink | |
16 | -# in /etc/ssl/certs to the certificate file and its inclusion into the | |
9af0daca | 17 | +# in @openssldir@ to the certificate file and its inclusion into the |
98dc7c4a ER |
18 | # bundle. |
19 | add() { | |
20 | CERT="$1" | |
df159834 | 21 | @@ -88,16 +88,6 @@ |
9c631836 | 22 | fi |
156426d3 JR |
23 | |
24 | echo "$ADDED_CNT added, $REMOVED_CNT removed; done." | |
25 | - | |
26 | -HOOKSDIR=/etc/ca-certificates/update.d | |
27 | -echo -n "Running hooks in $HOOKSDIR...." | |
28 | -VERBOSE_ARG= | |
29 | -[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose | |
df159834 | 30 | -eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook |
156426d3 JR |
31 | -do |
32 | - ( cat $ADDED | |
33 | - cat $REMOVED ) | $hook || echo E: $hook exited with code $?. | |
34 | -done | |
df159834 | 35 | echo "done." |
156426d3 JR |
36 | |
37 | # vim:set et sw=2: | |
9c631836 JR |
38 | --- ca-certificates/sbin/update-ca-certificates.8 2008-04-11 20:47:29.000000000 +0200 |
39 | +++ ca-certificates-undebianize/sbin/update-ca-certificates.8 2008-11-01 12:18:14.000000000 +0100 | |
40 | @@ -16,7 +16,7 @@ | |
41 | .\" .sp <n> insert n+1 empty lines | |
42 | .\" for manpage-specific macros, see man(7) | |
43 | .SH NAME | |
44 | -update-ca-certificates \- update /etc/ssl/certs and certificates.crt | |
9af0daca | 45 | +update-ca-certificates \- update @openssldir@ and ca-certificates.crt |
9c631836 JR |
46 | .SH SYNOPSIS |
47 | .B update-ca-certificates | |
48 | .RI [ options ] | |
49 | @@ -26,7 +26,7 @@ | |
9c631836 JR |
50 | This manual page was written for the Debian distribution. |
51 | .PP | |
156426d3 JR |
52 | \fBupdate-ca-certificates\fP is a program that updates the directory |
53 | -/etc/ssl/certs to hold SSL certificates and generates certificates.crt, | |
9af0daca | 54 | +@openssldir@ to hold SSL certificates and generates certificates.crt, |
156426d3 | 55 | a concatenated single-file list of certificates. |
9c631836 | 56 | .PP |
156426d3 | 57 | It reads the file /etc/ca-certificates.conf. Each line gives a pathname of |
9c631836 | 58 | @@ -34,11 +34,6 @@ |
156426d3 JR |
59 | .PP |
60 | Furthermore all certificates found below /usr/local/share/ca-certificates | |
61 | are also included as implicitly trusted. | |
9c631836 JR |
62 | -.PP |
63 | -Before terminating, \fBupdate-ca-certificates\fP invokes | |
64 | -\fBrun-parts\fP on /etc/ca-certificates/update.d and calls each hook with | |
65 | -a list of certificates: those added are prefixed with a +, those removed are | |
66 | -prefixed with a -. | |
67 | .SH OPTIONS | |
68 | A summary of options is included below. | |
69 | .TP | |
70 | @@ -49,13 +44,13 @@ | |
71 | Be verbose. Output \fBc_rehash\fP. | |
72 | .TP | |
73 | .B \-f, \-\-fresh | |
74 | -Fresh updates. Remove symlinks in /etc/ssl/certs directory. | |
9af0daca | 75 | +Fresh updates. Remove symlinks in @openssldir@ directory. |
9c631836 JR |
76 | .SH FILES |
77 | .TP | |
78 | .I /etc/ca-certificates.conf | |
79 | A configuration file. | |
80 | .TP | |
81 | -.I /etc/ssl/certs/ca-certificates.crt | |
eccb1882 | 82 | +.I /etc/openssl/ca-certificates.crt |
9c631836 JR |
83 | A single-file version of CA certificates. This hold |
84 | all CA certificates that you activated in /etc/ca-certificates.conf. | |
85 | .TP |