From 6be6e855c50db0a2214c7f763f4c0ddba4d75ae08d3574eda24adcc43bc34640 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 7 Aug 2017 14:13:34 +0000 Subject: [PATCH] - Update to version 2+git20170807.10b2785: * Check TRANSACTIONAL_UPDATE is set (boo#1045942) * Add systemd units OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates?expand=0&rev=70 --- _servicedata | 2 +- ca-certificates-2+git20151110.c15593c.tar.xz | 3 --- ca-certificates-2+git20170807.10b2785.tar.xz | 3 +++ ca-certificates.changes | 7 +++++++ ca-certificates.path | 16 ---------------- ca-certificates.service | 11 ----------- ca-certificates.spec | 14 +++++++------- 7 files changed, 18 insertions(+), 38 deletions(-) delete mode 100644 ca-certificates-2+git20151110.c15593c.tar.xz create mode 100644 ca-certificates-2+git20170807.10b2785.tar.xz delete mode 100644 ca-certificates.path delete mode 100644 ca-certificates.service diff --git a/_servicedata b/_servicedata index a1170a3..a73fe43 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ http://github.com/openSUSE/ca-certificates.git - c15593c0a7022a63dcc723f29327d87d14c6b99e \ No newline at end of file + 10b278586d2378e25d5cc9463be84c29725aa918 \ No newline at end of file diff --git a/ca-certificates-2+git20151110.c15593c.tar.xz b/ca-certificates-2+git20151110.c15593c.tar.xz deleted file mode 100644 index 1b92edf..0000000 --- a/ca-certificates-2+git20151110.c15593c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eadc0eba90dbad055c466471dfa6e3d595d39772302f81f9d06db81ccbbb3b43 -size 11396 diff --git a/ca-certificates-2+git20170807.10b2785.tar.xz b/ca-certificates-2+git20170807.10b2785.tar.xz new file mode 100644 index 0000000..ec67364 --- /dev/null +++ b/ca-certificates-2+git20170807.10b2785.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fded49bc1049eb1dcdde9f73bb490d8e1ff0ab2864c3d6798781590e81cca113 +size 11692 diff --git a/ca-certificates.changes b/ca-certificates.changes index fd51429..2340ddd 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 07 13:58:01 UTC 2017 - lnussel@suse.de + +- Update to version 2+git20170807.10b2785: + * Check TRANSACTIONAL_UPDATE is set (boo#1045942) + * Add systemd units + ------------------------------------------------------------------- Mon Jun 19 13:31:02 CEST 2017 - kukuk@suse.de diff --git a/ca-certificates.path b/ca-certificates.path deleted file mode 100644 index d96f8e3..0000000 --- a/ca-certificates.path +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Watch for changes in CA certificates -After=local-fs.target - -[Path] -Unit=ca-certificates.service -PathChanged=/usr/share/pki/trust -PathChanged=/usr/share/pki/trust/anchors -PathChanged=/usr/share/pki/trust/blacklist -PathChanged=/etc/pki/trust -PathChanged=/etc/pki/trust/anchors -PathChanged=/etc/pki/trust/blacklist - -[Install] -WantedBy=default.target - diff --git a/ca-certificates.service b/ca-certificates.service deleted file mode 100644 index 6696e45..0000000 --- a/ca-certificates.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Update system wide CA certificates -Wants=local-fs.target - -[Service] -Type=oneshot -ExecStart=/usr/sbin/update-ca-certificates - -[Install] -WantedBy=default.target - diff --git a/ca-certificates.spec b/ca-certificates.spec index 4551c32..3cc88fc 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -29,14 +29,12 @@ Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl %define cabundle /var/lib/ca-certificates/ca-bundle.pem %define sslcerts %{ssletcdir}/certs -Version: 2+git20151110.c15593c +Version: 2+git20170807.10b2785 Release: 0 Summary: Utilities for system wide CA certificate installation License: GPL-2.0+ Group: Productivity/Networking/Security Source0: ca-certificates-%{version}.tar.xz -Source1: ca-certificates.path -Source2: ca-certificates.service BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: https://github.com/openSUSE/ca-certificates # @@ -58,7 +56,9 @@ BuildArch: noarch %{?systemd_requires} %description -Utilities for system wide CA certificate installation +Update-ca-certificates is intended to keep the certificate stores of +SSL libraries like OpenSSL or GnuTLS in sync with the system's CA +certificate store that is managed by p11-kit. %prep %setup -q @@ -70,6 +70,7 @@ Utilities for system wide CA certificate installation rm -f certbundle.run %endif %make_install +ln -s service %{buildroot}%{_sbindir}/rcca-certificates install -d -m 755 %{buildroot}%{trustdir_cfg}/{anchors,blacklist} install -d -m 755 %{buildroot}%{trustdir_static}/{anchors,blacklist} install -d -m 755 %{buildroot}%{ssletcdir} @@ -84,8 +85,6 @@ install -D -m 644 /dev/null %{buildroot}/%{cabundle} ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem %endif install -D -m 644 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts -install -m 644 %{SOURCE1} %{buildroot}/%{_prefix}/lib/systemd/system/ -install -m 644 %{SOURCE2} %{buildroot}/%{_prefix}/lib/systemd/system/ # should be done in git. mv %{buildroot}/%{_prefix}/lib/ca-certificates/update.d/{,50}java.run @@ -140,7 +139,7 @@ fi # force rebuilding all certificate stores. # This also makes sure we update the hash links in /etc/ssl/certs # as openssl changed the hash format between 0.9.8 and 1.0 -#update-ca-certificates -f || true +update-ca-certificates -f || true %service_add_post ca-certificates.path ca-certificates.service %preun @@ -176,6 +175,7 @@ rm -rf %{buildroot} %dir /var/lib/ca-certificates %dir /var/lib/ca-certificates/pem %dir /var/lib/ca-certificates/openssl +%{_sbindir}/rcca-certificates %{_sbindir}/update-ca-certificates %{_mandir}/man8/update-ca-certificates.8* %{_prefix}/lib/ca-certificates/update.d/*java.run