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