packages: ca-certificates/ca-certificates-DESTDIR.patch, ca-certificates/ca...

Tue May 18 12:11:20 CEST 2010

Author: glen                         Date: Tue May 18 10:11:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cross distro compat (ac and likely ti as well); rel 10

---- Files affected:
packages/ca-certificates:
   ca-certificates-DESTDIR.patch (1.1 -> 1.2) , ca-certificates-etc-certs.patch (1.9 -> 1.10) , ca-certificates-undebianize.patch (1.6 -> 1.7) , ca-certificates.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates-DESTDIR.patch
diff -u packages/ca-certificates/ca-certificates-DESTDIR.patch:1.1 packages/ca-certificates/ca-certificates-DESTDIR.patch:1.2

--- packages/ca-certificates/ca-certificates-DESTDIR.patch:1.1	Wed May  5 13:18:58 2010
+++ packages/ca-certificates/ca-certificates-DESTDIR.patch	Tue May 18 12:11:14 2010
@@ -25,12 +25,12 @@
 -CERTSDIR=/usr/share/ca-certificates
 -LOCALCERTSDIR=/etc/certs
 -CERTBUNDLE=/etc/certs/ca-certificates.crt
--ETCCERTSDIR=/etc/openssl/certs
+-ETCCERTSDIR=@openssldir@
 +CERTSCONF=$DESTDIR/etc/ca-certificates.conf
 +CERTSDIR=$DESTDIR/usr/share/ca-certificates
 +LOCALCERTSDIR=$DESTDIR/etc/certs
 +CERTBUNDLE=$DESTDIR/etc/certs/ca-certificates.crt
-+ETCCERTSDIR=$DESTDIR/etc/openssl/certs
++ETCCERTSDIR=$DESTDIR at openssldir@
  
  cleanup() {
    rm -f "$TEMPBUNDLE"

================================================================
Index: packages/ca-certificates/ca-certificates-etc-certs.patch
diff -u packages/ca-certificates/ca-certificates-etc-certs.patch:1.9 packages/ca-certificates/ca-certificates-etc-certs.patch:1.10
--- packages/ca-certificates/ca-certificates-etc-certs.patch:1.9	Tue Mar 23 11:38:45 2010
+++ packages/ca-certificates/ca-certificates-etc-certs.patch	Tue May 18 12:11:14 2010
@@ -8,7 +8,7 @@
 -CERTBUNDLE=ca-certificates.crt
 +LOCALCERTSDIR=/etc/certs
 +CERTBUNDLE=/etc/certs/ca-certificates.crt
- ETCCERTSDIR=/etc/openssl/certs
+ ETCCERTSDIR=@openssldir@
  cd $ETCCERTSDIR
 @@ -52,7 +52,7 @@
  

================================================================
Index: packages/ca-certificates/ca-certificates-undebianize.patch
diff -u packages/ca-certificates/ca-certificates-undebianize.patch:1.6 packages/ca-certificates/ca-certificates-undebianize.patch:1.7
--- packages/ca-certificates/ca-certificates-undebianize.patch:1.6	Wed May  5 13:36:37 2010
+++ packages/ca-certificates/ca-certificates-undebianize.patch	Tue May 18 12:11:14 2010
@@ -5,7 +5,7 @@
  LOCALCERTSDIR=/usr/local/share/ca-certificates
  CERTBUNDLE=ca-certificates.crt
 -ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR=/etc/openssl/certs
++ETCCERTSDIR=@openssldir@
  
  cleanup() {
    rm -f "$TEMPBUNDLE"
@@ -14,7 +14,7 @@
  
  # 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
++# in @openssldir@ to the certificate file and its inclusion into the
  # bundle.
  add() {
    CERT="$1"
@@ -42,7 +42,7 @@
  .\" 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 @openssldir@ and ca-certificates.crt
  .SH SYNOPSIS
  .B update-ca-certificates
  .RI [ options ]
@@ -51,7 +51,7 @@
  .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,
++ at openssldir@ to hold SSL certificates and generates certificates.crt,
  a concatenated single-file list of certificates.
  .PP
  It reads the file /etc/ca-certificates.conf. Each line gives a pathname of
@@ -72,7 +72,7 @@
  .TP
  .B \-f, \-\-fresh
 -Fresh updates.  Remove symlinks in /etc/ssl/certs directory.
-+Fresh updates.  Remove symlinks in /etc/openssl/certs directory.
++Fresh updates.  Remove symlinks in @openssldir@ directory.
  .SH FILES
  .TP
  .I /etc/ca-certificates.conf

================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.35 packages/ca-certificates/ca-certificates.spec:1.36
--- packages/ca-certificates/ca-certificates.spec:1.35	Thu May  6 08:43:28 2010
+++ packages/ca-certificates/ca-certificates.spec	Tue May 18 12:11:14 2010
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20090814
-Release:	9
+Release:	10
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -67,6 +67,7 @@
 BuildRequires:	openssl-tools
 BuildRequires:	python
 BuildRequires:	python-modules
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 Obsoletes:	certificates
@@ -74,7 +75,11 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		certsdir	/etc/certs
+%if "%{pld_release}" == "th"
 %define		openssldir	/etc/openssl/certs
+%else
+%define		openssldir	/var/lib/openssl/certs
+%endif
 
 %description
 Common CA Certificates PEM files.
@@ -88,7 +93,11 @@
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mktemp
+%if "%{pld_release}" == "ac"
+Requires:	openssl-tools >= 0.9.7m-2
+%else
 Requires:	openssl-tools >= 0.9.8i-3
+%endif
 
 %description update
 Script and data for updating CA Certificates database.
@@ -106,6 +115,8 @@
 %patch5 -p1
 %patch6 -p1
 
+%{__sed} -i -e 's, at openssldir@,%{openssldir},' sbin/update-ca-certificates*
+
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
 mv 'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA.pem' \
@@ -200,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2010/05/18 10:11:14  glen
+- cross distro compat (ac and likely ti as well); rel 10
+
 Revision 1.35  2010/05/06 06:43:28  arekm
 - rel 9; revert; no hashes in main pkg
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-DESTDIR.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-etc-certs.patch?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates-undebianize.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.35&r2=1.36&f=u

