X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ca-certificates-undebianize.patch;h=125661e6bcad8a55ebe654c9c927e83bb0a4d2de;hb=9a2204c0181708a0a2a94f3aa29d147edeca87f5;hp=86ac0b7effa7f389d1c01632f5db5d72bbaa875b;hpb=156426d36ef1b7447e7999d609b356b37bed1f21;p=packages%2Fca-certificates.git

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index 86ac0b7..125661e 100644
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -1,60 +1,58 @@
-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
+--- 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
+@@ -28,7 +28,7 @@ CERTSCONF=/etc/ca-certificates.conf
  CERTSDIR=/usr/share/ca-certificates
  LOCALCERTSDIR=/usr/local/share/ca-certificates
--CERTBUNDLE=ca-certificates.crt
+ CERTBUNDLE=ca-certificates.crt
 -ETCCERTSDIR=/etc/ssl/certs
-+CERTBUNDLE=/etc/openssl/ca-certificates.crt
-+ETCCERTSDIR=/etc/openssl/certs
++ETCCERTSDIR=@openssldir@
+ HOOKSDIR=/etc/ca-certificates/update.d
  
- cleanup() {
-   rm -f "$TEMPBUNDLE"
-@@ -88,17 +88,6 @@
- fi
+ while [ $# -gt 0 ];
+@@ -187,19 +187,4 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
  
  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 $VERB_ARG --test -- $HOOKSDIR | while read hook
--do
--  ( cat $ADDED
--    cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
--done
--echo "done."
  
+-if [ -d "$HOOKSDIR" ]
+-then
+-
+-  echo "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."
+-
+-fi
+-
  # vim:set et sw=2:
- 
-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
+--- ca-certificates-20130610/sbin/update-ca-certificates.8~	2013-06-11 11:32:35.000000000 +0300
++++ ca-certificates-20130610/sbin/update-ca-certificates.8	2013-06-11 11:54:40.662201388 +0300
 @@ -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
+-update-ca-certificates \- update /etc/ssl/certs and ca-certificates.crt
++update-ca-certificates \- update @openssldir@ 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.
+@@ -26,7 +26,7 @@ This manual page documents briefly the
+ command.
  .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,
+-/etc/ssl/certs to hold SSL certificates and generates ca-certificates.crt,
++@openssldir@ to hold SSL certificates and generates ca-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 @@
+@@ -38,11 +38,6 @@
  .PP
- Furthermore all certificates found below /usr/local/share/ca-certificates
- are also included as implicitly trusted.
+ Furthermore all certificates with a .crt extension 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
@@ -63,12 +61,12 @@ diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebiani
  .SH OPTIONS
  A summary of options is included below.
  .TP
-@@ -49,13 +44,13 @@
+@@ -53,13 +48,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.
++Fresh updates.  Remove symlinks in @openssldir@ directory.
  .SH FILES
  .TP
  .I /etc/ca-certificates.conf
@@ -76,6 +74,6 @@ diff -ur ca-certificates/sbin/update-ca-certificates.8 ca-certificates-undebiani
  .TP
 -.I /etc/ssl/certs/ca-certificates.crt
 +.I /etc/openssl/ca-certificates.crt
- A single-file version of CA certificates.  This hold
+ A single-file version of CA certificates.  This holds
  all CA certificates that you activated in /etc/ca-certificates.conf.
  .TP