From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 1 Nov 2008 11:22:18 +0000 (+0000)
Subject: - use our global /etc/certs dir
X-Git-Tag: auto/th/ca-certificates-20080809-0_2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=9c6318364143e4e00a8518e0ab8792702d8a028f;ds=inline

- use our global /etc/certs dir
- removed debian specific run-parts

Changed files:
    ca-certificates-undebianize.patch -> 1.1
---

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
new file mode 100644
index 0000000..43ac0dc
--- /dev/null
+++ b/ca-certificates-undebianize.patch
@@ -0,0 +1,77 @@
+diff -ur ca-certificates/sbin/update-ca-certificates ca-certificates-undebianize/sbin/update-ca-certificates
+--- ca-certificates/sbin/update-ca-certificates	2008-04-11 20:47:29.000000000 +0200
++++ ca-certificates-undebianize/sbin/update-ca-certificates	2008-11-01 12:17:37.000000000 +0100
+@@ -38,7 +38,7 @@
+ CERTSCONF=/etc/ca-certificates.conf
+ CERTSDIR=/usr/share/ca-certificates
+ CERTBUNDLE=ca-certificates.crt
+-ETCCERTSDIR=/etc/ssl/certs
++ETCCERTSDIR=/etc/certs
+ cd $ETCCERTSDIR
+ if [ "$fresh" = 1 ]; then
+   echo -n "Clearing symlinks in $ETCCERTSDIR..."
+@@ -88,15 +88,6 @@
+     c_rehash .
+   fi
+   echo "done."
+-
+-  HOOKSDIR=/etc/ca-certificates/update.d
+-  echo -n "Running hooks in $HOOKSDIR...."
+-  VERBOSE_ARG=
+-  [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
+-  eval run-parts $VERB_ARG --test -- $HOOKSDIR | while read hook; do
+-  printf -- "${removed:+$removed\n}${added:+$added\n}" | eval $hook
+-  done
+-  echo "done."
+ else
+   echo "done."
+ fi
+diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebianize/sbin/update-ca-certificates.8
+--- 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/certs and certificates.crt
+ .SH SYNOPSIS
+ .B update-ca-certificates
+ .RI [ options ]
+@@ -26,7 +26,7 @@
+ commands.
+ This manual page was written for the Debian distribution.
+ .PP
+-\fBupdate-ca-certificates\fP is a program that updates /etc/ssl/certs
++\fBupdate-ca-certificates\fP is a program that updates /etc/certs
+ directory to hold SSL certificates and generates certificates.crt that is
+ single-file version of CA certificates.
+ .PP
+@@ -34,11 +34,6 @@
+ activated CA certificates under /usr/share/ca-certificates.
+ Lines that begin with "#" is comment line. 
+ Lines that begin with "!" is deselect, deactivation of the CA certificates. 
+-.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/certs directory.
+ .SH FILES
+ .TP
+ .I /etc/ca-certificates.conf
+ A configuration file.
+ .TP
+-.I /etc/ssl/certs/ca-certificates.crt
++.I /etc/certs/ca-certificates.crt
+ A single-file version of CA certificates.  This hold
+ all CA certificates that you activated in /etc/ca-certificates.conf.
+ .TP