X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=8dca9a69937db9ca02bab58667c1845c1498e3fe;hp=1b7536a3621c01c68cf627bbbdfce42f07c35beb;hb=7477ddf96c63f1c98fa2b1eb377092e2ba7343e6;hpb=a110f4b755e103e691cde7b2c4268ef5348b4e3c

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 1b7536a..8dca9a6 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,39 +1,118 @@
 # TODO
-# - keep one: certificates.spec vs ca-certificates.spec
-# - get rid (or update our rc-scripts) debianized run-parts
-# - use global certs dir or sth
+# - cleanup dead links from /etc/openssl/certs after -update uninstall
 Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
-Version:	20080809
-Release:	0.1
-# is it license name or should be unified? ("distributable"?)
-License:	freedist
+Version:	20090814
+Release:	1
+License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5:	c155f5059006b94ad0aea7018161ab37
+# Source0-md5:	307052c985bec7f9a00eb84293eef779
+Source1:	https://www.verisign.com/support/thawte-roots.zip
+# Source1-md5:	3e50e5facce6b6bfbf68271d066005fa
+Source2:	http://www.certum.pl/keys/CA.pem
+# Source2-md5:	35610177afc9c64e70f1ce62c1885496
+Source3:	http://www.certum.pl/keys/level1.pem
+# Source3-md5:	ba2d2e234ef9cfd2e6e5f810c964862e
+Source4:	http://www.certum.pl/keys/level2.pem
+# Source4-md5:	d06578a04e8cb23071f3870430ea0cf0
+Source5:	http://www.certum.pl/keys/level3.pem
+# Source5-md5:	47b67c63a52236576fc0d1150327c962
+Source6:	http://www.certum.pl/keys/level4.pem
+# Source6-md5:	f1f8a65d177745311a1e99f029ae5d71
+Source7:	http://www.certum.pl/keys/vs.pem
+# Source7-md5:	8da19ffc48c5dcc2868b1aa55f1d5983
+Source8:	http://www.certum.pl/keys/na.pem
+# Source8-md5:	ba571cb35e7672ff7ae95132ac1bfec4
+Source9:	http://www.certum.pl/keys/tsa.pem
+# Source9-md5:	1a7b3faf8ed00f4d80297de74862e102
+Source10:	http://www.certum.pl/keys/class1.pem
+# Source10-md5:	058436b132ea2df6972821f546104a16
+Source11:	http://www.certum.pl/keys/class2.pem
+# Source11-md5:	5caf7fe99b1fc6e63c40b3d081711d1b
+Source12:	http://www.certum.pl/keys/class3.pem
+# Source12-md5:	07bc97e21da092ba53535c7379e1b58b
+Source13:	http://www.certum.pl/keys/class4.pem
+# Source13-md5:	99ef61d509539af89f1c025b67245965
+Patch0:		%{name}-undebianize.patch
+Patch1:		%{name}-more-certs.patch
+Patch2:		%{name}-etc-certs.patch
+Patch3:		%{name}-c_rehash.sh.patch
 URL:		http://www.cacert.org/
-# for temp files
-Requires:	mktemp
-# for c_rehash
-Requires:	openssl-tools-perl
-# for /bin/run-parts
-Requires:	rc-scripts >= 0.4.1.25
+BuildRequires:	coreutils
+BuildRequires:	python
+BuildRequires:	unzip
+Obsoletes:	certificates
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		certsdir	/etc/certs
+
 %description
 Common CA Certificates PEM files.
 
 %description -l pl.UTF-8
 Pliki PEM popularnych certyfikatów CA.
 
+%package update
+Summary:	Script for updating CA Certificates database
+Summary(pl.UTF-8):	Skrypt do odświeżania bazy certyfikatów CA
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	mktemp
+Requires:	openssl-tools >= 0.9.8i-3
+
+%description update
+Script and data for updating CA Certificates database.
+
+%description update -l pl.UTF-8
+Skrypt i dane do odświeżania bazy certyfikatów CA.
+
 %prep
-%setup -q -n %{name}
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%{__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' \
+	'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA_CC.pem'
+
+find thawte/ -name *.pem | while read f ; do
+	ff=$(echo $f | sed -e 's|[ ,]|_|g' -e 's|[()]|=|g')
+	fff="thawte/$(basename "$ff" .pem).crt"
+	tr -d '\r' < "$f" > "$fff"
+done
+
+install -d certum
+install %{SOURCE2} certum
+install %{SOURCE3} certum
+install %{SOURCE4} certum
+install %{SOURCE5} certum
+install %{SOURCE6} certum
+install %{SOURCE7} certum
+install %{SOURCE8} certum
+install %{SOURCE9} certum
+install %{SOURCE10} certum
+install %{SOURCE11} certum
+install %{SOURCE12} certum
+install %{SOURCE13} certum
+for a in certum/*.pem; do
+	mv "$a" "${a%.pem}.crt"
+done
+
+%build
+%{__make}
+
+# We have those and more in specific dirs
+rm mozilla/{Thawte,thawte,Certum}*.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},/etc/ssl/certs,%{_sysconfdir}/ca-certificates/update.d}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -43,20 +122,23 @@ cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-touch $RPM_BUILD_ROOT/etc/ssl/certs/ca-certificates.crt
+(
+cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
+find . -name '*.crt' -print0 | xargs -0 cat
+) > $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post update
 %{_sbindir}/update-ca-certificates || :
 
 %files
 %defattr(644,root,root,755)
-%dir /etc/ssl/certs
-%config(noreplace) %verify(not md5 mtime size) /etc/ssl/certs/ca-certificates.crt
-# remove noreplace?
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
-%dir %{_sysconfdir}/ca-certificates/update.d
+%config(noreplace) %verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
+
+%files update
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
 %{_datadir}/ca-certificates