packages: ca-certificates/ca-certificates-etc-certs.patch, ca-certificates/...

[baggins]

Author: baggins                      Date: Mon Feb  1 13:31:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed bundle location

---- Files affected:
packages/ca-certificates:
   ca-certificates-etc-certs.patch (1.2 -> 1.3) , ca-certificates-undebianize.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates-etc-certs.patch
diff -u packages/ca-certificates/ca-certificates-etc-certs.patch:1.2 packages/ca-certificates/ca-certificates-etc-certs.patch:1.3
--- packages/ca-certificates/ca-certificates-etc-certs.patch:1.2	Mon Feb  1 14:24:59 2010
+++ packages/ca-certificates/ca-certificates-etc-certs.patch	Mon Feb  1 14:31:53 2010
@@ -6,7 +6,7 @@
  CERTSDIR=/usr/share/ca-certificates
 -LOCALCERTSDIR=/usr/local/share/ca-certificates
 +LOCALCERTSDIR=/etc/certs
- CERTBUNDLE=/etc/openssl/ca-certificates.crt
+ CERTBUNDLE=ca-certificates.crt
  ETCCERTSDIR=/etc/openssl/certs
  cd $ETCCERTSDIR
 @@ -62,7 +62,7 @@

================================================================
Index: packages/ca-certificates/ca-certificates-undebianize.patch
diff -u packages/ca-certificates/ca-certificates-undebianize.patch:1.3 packages/ca-certificates/ca-certificates-undebianize.patch:1.4
--- packages/ca-certificates/ca-certificates-undebianize.patch:1.3	Mon Feb  1 14:24:59 2010
+++ packages/ca-certificates/ca-certificates-undebianize.patch	Mon Feb  1 14:31:53 2010
@@ -2,17 +2,15 @@
 --- 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
  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 @@
+@@ -88,16 +88,6 @@
  fi
  
  echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
@@ -21,15 +19,14 @@
 -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-etc-certs.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-undebianize.patch?r1=1.3&r2=1.4&f=u