diff --git a/ca-certificates-1_201308051322.tar.xz b/ca-certificates-1_201308051322.tar.xz deleted file mode 100644 index 8773fa5..0000000 --- a/ca-certificates-1_201308051322.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd0424cb50d79fad3602fa21950719439dffe24484fd30a46806d8d06053c799 -size 13472 diff --git a/ca-certificates-1_201308271454.tar.xz b/ca-certificates-1_201308271454.tar.xz new file mode 100644 index 0000000..02afbc4 --- /dev/null +++ b/ca-certificates-1_201308271454.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4db8ce03f734e9a6c2799a12e4c259347def987eb0ad567236ba5ad492284edf +size 11328 diff --git a/ca-certificates.changes b/ca-certificates.changes index c28738d..447e714 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 27 12:53:44 UTC 2013 - lnussel@suse.de + +- re-enable the CA bundle again for glib-networking (bnc#825903) + +------------------------------------------------------------------- +Tue Aug 27 07:11:04 UTC 2013 - lnussel@suse.de + +- make sure we have p11-kit >= 0.19.3 which has the 'trust' command + (bnc#836560) + ------------------------------------------------------------------- Mon Aug 5 11:24:04 UTC 2013 - lnussel@suse.de diff --git a/ca-certificates.spec b/ca-certificates.spec index 126d115..64ee9d8 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -17,10 +17,10 @@ # 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 +# proprietary packages. It's not meant to be used at all. +# unfortunately glib-networking has such a complicated abstraction +# on top of gnutls that we have to live with the bundle for now +%bcond_without cabundle BuildRequires: openssl BuildRequires: p11-kit-devel @@ -29,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_201308051322 +Version: 1_201308271454 Release: 0 Summary: Utilities for system wide CA certificate installation License: GPL-2.0+ @@ -40,7 +40,7 @@ Url: https://github.com/openSUSE/ca-certificates # Requires: openssl Requires: p11-kit -Requires: p11-kit-tools +Requires: p11-kit-tools >= 0.19.3 # needed for %post Requires(post): coreutils openssl p11-kit-tools Recommends: ca-certificates-mozilla