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

[baggins]

Author: baggins                      Date: Tue Feb  9 14:16:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3
- make update-ca-certificates create bundle in proper place

---- Files affected:
packages/ca-certificates:
   ca-certificates-etc-certs.patch (1.6 -> 1.7) , ca-certificates.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates-etc-certs.patch
diff -u packages/ca-certificates/ca-certificates-etc-certs.patch:1.6 packages/ca-certificates/ca-certificates-etc-certs.patch:1.7
--- packages/ca-certificates/ca-certificates-etc-certs.patch:1.6	Mon Feb  1 14:42:37 2010
+++ packages/ca-certificates/ca-certificates-etc-certs.patch	Tue Feb  9 15:16:16 2010
@@ -5,10 +5,20 @@
  CERTSCONF=/etc/ca-certificates.conf
  CERTSDIR=/usr/share/ca-certificates
 -LOCALCERTSDIR=/usr/local/share/ca-certificates
+-CERTBUNDLE=ca-certificates.crt
 +LOCALCERTSDIR=/etc/certs
- CERTBUNDLE=ca-certificates.crt
++CERTBUNDLE=/etc/certs/ca-certificates.crt
  ETCCERTSDIR=/etc/openssl/certs
  cd $ETCCERTSDIR
+@@ -52,7 +52,7 @@
+ 
+ # Helper files.  (Some of them are not simple arrays because we spawn
+ # subshells later on.)
+-TEMPBUNDLE="$(mktemp -t "${CERTBUNDLE}.tmp.XXXXXX")"
++TEMPBUNDLE="$(mktemp "${CERTBUNDLE}.tmp.XXXXXX")"
+ ADDED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+ REMOVED="$(mktemp -t "ca-certificates.tmp.XXXXXX")"
+ 
 @@ -62,7 +62,7 @@
  # bundle.
  add() {

================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.25 packages/ca-certificates/ca-certificates.spec:1.26
--- packages/ca-certificates/ca-certificates.spec:1.25	Thu Feb  4 15:27:03 2010
+++ packages/ca-certificates/ca-certificates.spec	Tue Feb  9 15:16:16 2010
@@ -5,7 +5,7 @@
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20090814
-Release:	2
+Release:	3
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -151,6 +151,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/02/09 14:16:16  baggins
+- rel 3
+- make update-ca-certificates create bundle in proper place
+
 Revision 1.25  2010/02/04 14:27:03  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-etc-certs.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates.spec?r1=1.25&r2=1.26&f=u