packages: ca-certificates/ca-certificates.spec, ca-certificates/ca-certific...
glen
glen at pld-linux.org
Wed May 5 13:19:03 CEST 2010
Author: glen Date: Wed May 5 11:19:03 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use same method for generating /etc/certs/ca-certificates.crt at package build time
- %20 vs space fix workaround
---- Files affected:
packages/ca-certificates:
ca-certificates.spec (1.31 -> 1.32) , ca-certificates-DESTDIR.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.31 packages/ca-certificates/ca-certificates.spec:1.32
--- packages/ca-certificates/ca-certificates.spec:1.31 Wed May 5 12:40:03 2010
+++ packages/ca-certificates/ca-certificates.spec Wed May 5 13:18:58 2010
@@ -9,7 +9,7 @@
Summary(pl.UTF-8): Pliki PEM popularnych certyfikatów CA
Name: ca-certificates
Version: 20090814
-Release: 6
+Release: 6.4
License: distributable
Group: Libraries
Source0: ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -62,6 +62,7 @@
Patch3: %{name}-c_rehash.sh.patch
Patch4: %{name}-endline.patch
Patch5: %{name}-mozilla.patch
+Patch6: %{name}-DESTDIR.patch
URL: http://www.cacert.org/
BuildRequires: openssl-tools
BuildRequires: python
@@ -73,6 +74,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define certsdir /etc/certs
+%define openssldir /etc/openssl/certs
%description
Common CA Certificates PEM files.
@@ -102,6 +104,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%{__unzip} -qq %{SOURCE1} -d thawte
# resolve file name clash
@@ -142,7 +145,7 @@
install -d esteid
cp -a %{SOURCE19} esteid
cp -a %{SOURCE20} esteid
-cp -a %{SOURCE21} esteid
+cp -a %{SOURCE21} esteid/ESTEID-SK_2007.crt
for a in esteid/*.PEM.cer; do
mv "$a" "${a%.PEM.cer}.crt"
done
@@ -170,10 +173,10 @@
find . -name '*.crt' | sort | cut -b3-
) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
-find $RPM_BUILD_ROOT%{_datadir}/ca-certificates -name '*.crt' | while read cert ; do
- cat "$cert" >> $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
- echo >>$RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
-done
+# build %{certsdir}/ca-certificates.crt
+install -d $RPM_BUILD_ROOT%{openssldir}
+./sbin/update-ca-certificates --destdir $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{openssldir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -197,6 +200,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2010/05/05 11:18:58 glen
+- use same method for generating /etc/certs/ca-certificates.crt at package build time
+- %20 vs space fix workaround
+
Revision 1.31 2010/05/05 10:40:03 glen
- add esteid certs, www.sk.ee
================================================================
Index: packages/ca-certificates/ca-certificates-DESTDIR.patch
diff -u /dev/null packages/ca-certificates/ca-certificates-DESTDIR.patch:1.1
--- /dev/null Wed May 5 13:19:03 2010
+++ packages/ca-certificates/ca-certificates-DESTDIR.patch Wed May 5 13:18:58 2010
@@ -0,0 +1,36 @@
+--- ca-certificates-20090814/sbin/update-ca-certificates~ 2010-05-05 14:10:46.000000000 +0300
++++ ca-certificates-20090814/sbin/update-ca-certificates 2010-05-05 14:10:52.783355044 +0300
+@@ -23,6 +23,7 @@
+
+ verbose=0
+ fresh=0
++DESTDIR=
+ while [ $# -gt 0 ];
+ do
+ case $1 in
+@@ -30,6 +31,8 @@
+ verbose=1;;
+ --fresh|-f)
+ fresh=1;;
++ --destdir)
++ DESTDIR=$2; shift;;
+ --help|-h|*)
+ echo "$0: [--verbose] [--fresh]"
+ exit;;
+@@ -37,11 +40,11 @@
+ shift
+ done
+
+-CERTSCONF=/etc/ca-certificates.conf
+-CERTSDIR=/usr/share/ca-certificates
+-LOCALCERTSDIR=/etc/certs
+-CERTBUNDLE=/etc/certs/ca-certificates.crt
+-ETCCERTSDIR=/etc/openssl/certs
++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
+
+ cleanup() {
+ rm -f "$TEMPBUNDLE"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates.spec?r1=1.31&r2=1.32&f=u
More information about the pld-cvs-commit
mailing list