- cross distro compat (ac and likely ti as well); rel 10

Changed files:
    ca-certificates-DESTDIR.patch -> 1.2
    ca-certificates-etc-certs.patch -> 1.10
    ca-certificates-undebianize.patch -> 1.7
    ca-certificates.spec -> 1.36

diff --git a/ca-certificates-DESTDIR.patch b/ca-certificates-DESTDIR.patch
index c885375d22f943d401ba66bdbf612a1c352ce1bf..087dcd91f2bf80e193880d51a98b653e67ac3183 100644 (file)
--- a/ca-certificates-DESTDIR.patch
+++ b/ca-certificates-DESTDIR.patch
@@ -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@openssldir@
  
  cleanup() {
    rm -f "$TEMPBUNDLE"

diff --git a/ca-certificates-etc-certs.patch b/ca-certificates-etc-certs.patch
index 36c56f3434bf290ae7eda48f6e9c98df660b910b..a321e259959be7324032fc2b4ecd4f23796345d2 100644 (file)
--- a/ca-certificates-etc-certs.patch
+++ b/ca-certificates-etc-certs.patch
@@ -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 @@
  

diff --git a/ca-certificates-undebianize.patch b/ca-certificates-undebianize.patch
index ecbd2e1614d233c591e381a4f831fc28d0545a93..225da7442ad14d0d89a009f35ad79ffc243e286b 100644 (file)
--- a/ca-certificates-undebianize.patch
+++ b/ca-certificates-undebianize.patch
@@ -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,
++@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

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 82e67379120c1d00ac8c45c706d53dbfc41e29ac..f047310768a5e3f73a022b343acfe675d50412cb 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -8,7 +8,7 @@ Summary:        Common CA Certificates PEM files
 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
@@ -66,6 +66,7 @@ URL:          http://www.cacert.org/
 BuildRequires: openssl-tools
 BuildRequires: python
 BuildRequires: python-modules
+BuildRequires: rpm >= 4.4.9-56
 BuildRequires: sed >= 4.0
 BuildRequires: unzip
 Obsoletes:     certificates
@@ -73,7 +74,11 @@ BuildArch:   noarch
 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.
@@ -87,7 +92,11 @@ Summary(pl.UTF-8):   Skrypt do odświeżania bazy certyfikatów CA
 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.
@@ -105,6 +114,8 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch5 -p1
 %patch6 -p1
 
+%{__sed} -i -e 's,@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' \