From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 9 Feb 2010 14:16:16 +0000 (+0000)
Subject: - rel 3
X-Git-Tag: auto/th/ca-certificates-20090814-3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=commitdiff_plain;h=2bf66f1a9c1b1db8daeba27e4a2e077e2c7fc00f

- rel 3
- make update-ca-certificates create bundle in proper place

Changed files:
    ca-certificates-etc-certs.patch -> 1.7
    ca-certificates.spec -> 1.26
---

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index af0617d..41c2c43 100644
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -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() {
diff --git a/ca-certificates.spec b/ca-certificates.spec
index 94a12f0..4d7f599 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -4,7 +4,7 @@ Summary:	Common CA Certificates PEM files
 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