- use same method for generating /etc/certs/ca-certificates.crt at package build...

[packages/ca-certificates.git] / ca-certificates-undebianize.patch

--- ca-certificates-undebianize/sbin/update-ca-certificates	2008-11-01 12:17:37.000000000 +0100
+++ ca-certificates-20090814/sbin/update-ca-certificates	2010-05-05 14:03:33.683398895 +0300
@@ -38,7 +38,7 @@
 CERTSDIR=/usr/share/ca-certificates
 LOCALCERTSDIR=/usr/local/share/ca-certificates
 CERTBUNDLE=ca-certificates.crt
-ETCCERTSDIR=/etc/ssl/certs
+ETCCERTSDIR=/etc/openssl/certs
 
 cleanup() {
   rm -f "$TEMPBUNDLE"
@@ -57,7 +57,7 @@
 REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
 
 # Adds a certificate to the list of trusted ones.  This includes a symlink
-# in /etc/ssl/certs to the certificate file and its inclusion into the
+# in /etc/openssl/certs to the certificate file and its inclusion into the
 # bundle.
 add() {
   CERT="$1"
@@ -88,16 +88,6 @@
 fi
 
 echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
-
-HOOKSDIR=/etc/ca-certificates/update.d
-echo -n "Running hooks in $HOOKSDIR...."
-VERBOSE_ARG=
-[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
-eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
-do
-  ( cat $ADDED
-    cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
-done
 echo "done."
 
 # vim:set et sw=2:
--- ca-certificates/sbin/update-ca-certificates.8	2008-04-11 20:47:29.000000000 +0200
+++ ca-certificates-undebianize/sbin/update-ca-certificates.8	2008-11-01 12:18:14.000000000 +0100
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-update-ca-certificates \- update /etc/ssl/certs and certificates.crt
+update-ca-certificates \- update /etc/openssl/certs and ca-certificates.crt
 .SH SYNOPSIS
 .B update-ca-certificates
 .RI [ options ]
@@ -26,7 +26,7 @@
 This manual page was written for the Debian distribution.
 .PP
 \fBupdate-ca-certificates\fP is a program that updates the directory
-/etc/ssl/certs to hold SSL certificates and generates certificates.crt,
+/etc/openssl/certs to hold SSL certificates and generates certificates.crt,
 a concatenated single-file list of certificates.
 .PP
 It reads the file /etc/ca-certificates.conf. Each line gives a pathname of
@@ -34,11 +34,6 @@
 .PP
 Furthermore all certificates found below /usr/local/share/ca-certificates
 are also included as implicitly trusted.
-.PP
-Before terminating, \fBupdate-ca-certificates\fP invokes
-\fBrun-parts\fP on /etc/ca-certificates/update.d and calls each hook with
-a list of certificates: those added are prefixed with a +, those removed are
-prefixed with a -.
 .SH OPTIONS
 A summary of options is included below.
 .TP
@@ -49,13 +44,13 @@
 Be verbose. Output \fBc_rehash\fP.
 .TP
 .B \-f, \-\-fresh
-Fresh updates.  Remove symlinks in /etc/ssl/certs directory.
+Fresh updates.  Remove symlinks in /etc/openss/certs directory.
 .SH FILES
 .TP
 .I /etc/ca-certificates.conf
 A configuration file.
 .TP
-.I /etc/ssl/certs/ca-certificates.crt
+.I /etc/openssl/ca-certificates.crt
 A single-file version of CA certificates.  This hold
 all CA certificates that you activated in /etc/ca-certificates.conf.
 .TP