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

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index 86ac0b7..35e52b6 100644
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -1,18 +1,24 @@
-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
+--- 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 @@
- 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
  
  cleanup() {
    rm -f "$TEMPBUNDLE"
-@@ -88,17 +88,6 @@
+@@ -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."
@@ -21,16 +27,14 @@ diff -ur ca-certificates/sbin/update-ca-certificates ca-certificates-undebianize
 -echo -n "Running hooks in $HOOKSDIR...."
 -VERBOSE_ARG=
 -[ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
--eval run-parts $VERB_ARG --test -- $HOOKSDIR | while read hook
+-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."
+ echo "done."
  
  # 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
 @@ -16,7 +16,7 @@