]>
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 | |
76b4b9b9 | 3 | @@ -28,7 +28,7 @@ CERTSCONF=/etc/ca-certificates.conf |
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@ |
76b4b9b9 | 9 | HOOKSDIR=/etc/ca-certificates/update.d |
156426d3 | 10 | |
76b4b9b9 AM |
11 | while [ $# -gt 0 ]; |
12 | @@ -187,19 +187,4 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" | |
156426d3 JR |
13 | |
14 | echo "$ADDED_CNT added, $REMOVED_CNT removed; done." | |
156426d3 | 15 | |
76b4b9b9 AM |
16 | -if [ -d "$HOOKSDIR" ] |
17 | -then | |
18 | - | |
19 | - echo "Running hooks in $HOOKSDIR..." | |
20 | - VERBOSE_ARG= | |
21 | - [ "$verbose" = 0 ] || VERBOSE_ARG="--verbose" | |
22 | - eval run-parts "$VERBOSE_ARG" --test -- "$HOOKSDIR" | while read hook | |
23 | - do | |
24 | - ( cat "$ADDED" | |
25 | - cat "$REMOVED" ) | "$hook" || echo "E: $hook exited with code $?." | |
26 | - done | |
27 | - echo "done." | |
28 | - | |
29 | -fi | |
30 | - | |
156426d3 | 31 | # vim:set et sw=2: |
59b34d92 ER |
32 | --- ca-certificates-20130610/sbin/update-ca-certificates.8~ 2013-06-11 11:32:35.000000000 +0300 |
33 | +++ ca-certificates-20130610/sbin/update-ca-certificates.8 2013-06-11 11:54:40.662201388 +0300 | |
9c631836 JR |
34 | @@ -16,7 +16,7 @@ |
35 | .\" .sp <n> insert n+1 empty lines | |
36 | .\" for manpage-specific macros, see man(7) | |
37 | .SH NAME | |
76b4b9b9 | 38 | -update-ca-certificates \- update /etc/ssl/certs and ca-certificates.crt |
9af0daca | 39 | +update-ca-certificates \- update @openssldir@ and ca-certificates.crt |
9c631836 JR |
40 | .SH SYNOPSIS |
41 | .B update-ca-certificates | |
42 | .RI [ options ] | |
76b4b9b9 AM |
43 | @@ -26,7 +26,7 @@ This manual page documents briefly the |
44 | command. | |
9c631836 | 45 | .PP |
156426d3 | 46 | \fBupdate-ca-certificates\fP is a program that updates the directory |
76b4b9b9 AM |
47 | -/etc/ssl/certs to hold SSL certificates and generates ca-certificates.crt, |
48 | +@openssldir@ to hold SSL certificates and generates ca-certificates.crt, | |
156426d3 | 49 | a concatenated single-file list of certificates. |
9c631836 | 50 | .PP |
156426d3 | 51 | It reads the file /etc/ca-certificates.conf. Each line gives a pathname of |
59b34d92 | 52 | @@ -38,11 +38,6 @@ |
156426d3 | 53 | .PP |
59b34d92 ER |
54 | Furthermore all certificates with a .crt extension found below |
55 | /usr/local/share/ca-certificates are also included as implicitly trusted. | |
9c631836 JR |
56 | -.PP |
57 | -Before terminating, \fBupdate-ca-certificates\fP invokes | |
58 | -\fBrun-parts\fP on /etc/ca-certificates/update.d and calls each hook with | |
59 | -a list of certificates: those added are prefixed with a +, those removed are | |
60 | -prefixed with a -. | |
61 | .SH OPTIONS | |
62 | A summary of options is included below. | |
63 | .TP | |
59b34d92 | 64 | @@ -53,13 +48,13 @@ |
4ab1fc5e | 65 | Be verbose. Output \fBopenssl rehash\fP. |
9c631836 JR |
66 | .TP |
67 | .B \-f, \-\-fresh | |
68 | -Fresh updates. Remove symlinks in /etc/ssl/certs directory. | |
9af0daca | 69 | +Fresh updates. Remove symlinks in @openssldir@ directory. |
9c631836 JR |
70 | .SH FILES |
71 | .TP | |
72 | .I /etc/ca-certificates.conf | |
73 | A configuration file. | |
74 | .TP | |
75 | -.I /etc/ssl/certs/ca-certificates.crt | |
eccb1882 | 76 | +.I /etc/openssl/ca-certificates.crt |
59b34d92 | 77 | A single-file version of CA certificates. This holds |
9c631836 JR |
78 | all CA certificates that you activated in /etc/ca-certificates.conf. |
79 | .TP |