- 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
This commit is contained in:
Ludwig Nussel 2017-08-07 14:13:34 +00:00 committed by Git OBS Bridge
parent bd3751f1c6
commit 6be6e855c5
7 changed files with 18 additions and 38 deletions

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">http://github.com/openSUSE/ca-certificates.git</param>
<param name="changesrevision">c15593c0a7022a63dcc723f29327d87d14c6b99e</param></service></servicedata>
<param name="changesrevision">10b278586d2378e25d5cc9463be84c29725aa918</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eadc0eba90dbad055c466471dfa6e3d595d39772302f81f9d06db81ccbbb3b43
size 11396

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fded49bc1049eb1dcdde9f73bb490d8e1ff0ab2864c3d6798781590e81cca113
size 11692

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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