diff --git a/ca-certificates-1_201306200949.tar.xz b/ca-certificates-1_201306200949.tar.xz deleted file mode 100644 index 08e13fc..0000000 --- a/ca-certificates-1_201306200949.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc0214c126e171e87907aa61e76f70f2ac3267b262bb775bda2acb36fd6c0e2a -size 13736 diff --git a/ca-certificates-1_201307011044.tar.xz b/ca-certificates-1_201307011044.tar.xz new file mode 100644 index 0000000..a7903c0 --- /dev/null +++ b/ca-certificates-1_201307011044.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d53610c188a14cb3c7111d9ff215ad7fd6301ada52fa821ead27b4b8066be9f +size 13476 diff --git a/ca-certificates.changes b/ca-certificates.changes index 1a40e72..e82f135 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,9 +1,20 @@ +------------------------------------------------------------------- +Thu Jun 27 16:17:51 UTC 2013 - lnussel@suse.de + +- disable generating ca-bundle for now again so people don't submit + new packages that use this file. + ------------------------------------------------------------------- Mon Jun 24 21:09:16 UTC 2013 - hrvoje.senjan@gmail.com - Explicitly require p11-kit, otherwise trusted certificates won't be generated +------------------------------------------------------------------- +Mon Jun 24 12:46:30 UTC 2013 - lnussel@suse.de + +- update manpage + ------------------------------------------------------------------- Thu Jun 20 09:15:52 UTC 2013 - lnussel@suse.de diff --git a/ca-certificates.spec b/ca-certificates.spec index f03aadb..124a235 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -16,6 +16,12 @@ # +# the ca bundle file was meant as compat option for e.g. +# proprietary packages. Now that I see it abused in free software +# packages that can be trivially patched to do the right thing I'm +# disabling this for now again. +%bcond_with cabundle + BuildRequires: openssl BuildRequires: p11-kit-devel @@ -23,7 +29,7 @@ Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl %define cabundle /var/lib/ca-certificates/ca-bundle.pem %define sslcerts %{ssletcdir}/certs -Version: 1_201306200949 +Version: 1_201307011044 Release: 0 Summary: Utilities for system wide CA certificate installation License: GPL-2.0+ @@ -57,6 +63,9 @@ Utilities for system wide CA certificate installation %build %install +%if %{without cabundle} +rm -f certbundle.run +%endif %make_install install -d m 755 %{buildroot}%{trustdir_cfg}/{anchors,blacklist} install -d m 755 %{buildroot}%{trustdir_static}/{anchors,blacklist} @@ -65,9 +74,11 @@ install -d m 755 %{buildroot}/etc/ca-certificates/update.d install -d m 755 %{buildroot}%{_prefix}/lib/ca-certificates/update.d install -d m 755 %{buildroot}/var/lib/ca-certificates/pem install -d m 755 %{buildroot}/var/lib/ca-certificates/openssl +%if %{with cabundle} install -D -m 644 /dev/null %{buildroot}/%{cabundle} -install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem +%endif +install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts %post if [ -s /etc/ca-certificates.conf ]; then @@ -104,8 +115,6 @@ rm -rf %{buildroot} %dir %{trustdir_static}/anchors %dir %{trustdir_static}/blacklist %dir /etc/ssl/certs -%{ssletcdir}/ca-bundle.pem -%ghost %{cabundle} %ghost /var/lib/ca-certificates/java-cacerts %dir /etc/ca-certificates %dir /etc/ca-certificates/update.d @@ -117,8 +126,13 @@ rm -rf %{buildroot} %{_sbindir}/update-ca-certificates %{_mandir}/man8/update-ca-certificates.8* %{_prefix}/lib/ca-certificates/update.d/java.run -%{_prefix}/lib/ca-certificates/update.d/certbundle.run %{_prefix}/lib/ca-certificates/update.d/etc_ssl.run %{_prefix}/lib/ca-certificates/update.d/openssl.run +# +%if %{with cabundle} +%{ssletcdir}/ca-bundle.pem +%ghost %{cabundle} +%{_prefix}/lib/ca-certificates/update.d/certbundle.run +%endif %changelog