From e8f20176e3b5e36020d3e560a762689d1d6ec78bccce9f9d7c7dc66e718fde26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Sep 2024 16:03:43 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main ca-certificates revision 58f4b1fc6431ab3987711c73a7ece350 --- _servicedata | 2 +- ca-certificates-2+git20230406.2dae8b7.obscpio | 3 --- ca-certificates-2+git20240805.fd24d50.obscpio | 3 +++ ca-certificates.changes | 18 ++++++++++++++++++ ca-certificates.obsinfo | 6 +++--- ca-certificates.spec | 14 ++++++-------- 6 files changed, 31 insertions(+), 15 deletions(-) delete mode 100644 ca-certificates-2+git20230406.2dae8b7.obscpio create mode 100644 ca-certificates-2+git20240805.fd24d50.obscpio diff --git a/_servicedata b/_servicedata index 77a3261..9cac2fb 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ http://github.com/openSUSE/ca-certificates.git d16f02666b959e10f5bc64b6ab26b398f388ad0b https://github.com/openSUSE/ca-certificates.git - 2dae8b77c250506dc1bf862351c3a5de89a08e90 \ No newline at end of file + fd24d504812a7c81940a3bd8e7620c9443018146 \ No newline at end of file diff --git a/ca-certificates-2+git20230406.2dae8b7.obscpio b/ca-certificates-2+git20230406.2dae8b7.obscpio deleted file mode 100644 index 1d8f5d0..0000000 --- a/ca-certificates-2+git20230406.2dae8b7.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:761342aa25abae051436108d8db5c7d810759bed1c8a43b8f50eecde268c8c7e -size 75787 diff --git a/ca-certificates-2+git20240805.fd24d50.obscpio b/ca-certificates-2+git20240805.fd24d50.obscpio new file mode 100644 index 0000000..fa98b9f --- /dev/null +++ b/ca-certificates-2+git20240805.fd24d50.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72078da7a160b2d9f8454951bf3ae60ba5ce060a111b7499d2d69f1177664e2e +size 76811 diff --git a/ca-certificates.changes b/ca-certificates.changes index c37564f..0dea7c6 100644 --- a/ca-certificates.changes +++ b/ca-certificates.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Aug 21 12:07:55 UTC 2024 - Thorsten Kukuk + +- Fix source archive + +------------------------------------------------------------------- +Mon Aug 05 08:54:36 UTC 2024 - kukuk@suse.com + +- Update to version 2+git20240805.fd24d50: + * Remove rc symlink [jsc#PED-266] + +------------------------------------------------------------------- +Mon Apr 29 11:34:23 UTC 2024 - kukuk@suse.com + +- Update to version 2+git20240415.3fe9324: + * Add ca-certificates-setup.service + * typo: differnt/different + ------------------------------------------------------------------- Thu Apr 06 08:03:11 UTC 2023 - lnussel@suse.de diff --git a/ca-certificates.obsinfo b/ca-certificates.obsinfo index c5ac13a..63146e1 100644 --- a/ca-certificates.obsinfo +++ b/ca-certificates.obsinfo @@ -1,4 +1,4 @@ name: ca-certificates -version: 2+git20230406.2dae8b7 -mtime: 1680768174 -commit: 2dae8b77c250506dc1bf862351c3a5de89a08e90 +version: 2+git20240805.fd24d50 +mtime: 1722848060 +commit: fd24d504812a7c81940a3bd8e7620c9443018146 diff --git a/ca-certificates.spec b/ca-certificates.spec index 7595116..e32f6ca 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -1,7 +1,7 @@ # # spec file for package ca-certificates # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,7 @@ Name: ca-certificates %define ssletcdir %{_sysconfdir}/ssl %define cabundle /var/lib/ca-certificates/ca-bundle.pem %define sslcerts %{ssletcdir}/certs -Version: 2+git20230406.2dae8b7%{git_version} +Version: 2+git20240805.fd24d50%{git_version} Release: 0 Summary: Utilities for system wide CA certificate installation License: GPL-2.0-or-later @@ -74,7 +74,6 @@ certificate store that is managed by p11-kit. 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} @@ -91,21 +90,21 @@ ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem install -D -m 444 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts %pre -%service_add_pre ca-certificates.path ca-certificates.service +%service_add_pre ca-certificates.path ca-certificates.service ca-certificates-setup.service %post # force rebuilding all certificate stores. update-ca-certificates -f || true -%service_add_post ca-certificates.path ca-certificates.service +%service_add_post ca-certificates.path ca-certificates.service ca-certificates-setup.service %preun -%service_del_preun ca-certificates.path ca-certificates.service +%service_del_preun ca-certificates.path ca-certificates.service ca-certificates-setup.service %postun if [ "$1" -eq 0 ]; then rm -rf /var/lib/ca-certificates/pem /var/lib/ca-certificates/openssl fi -%service_del_postun ca-certificates.path ca-certificates.service +%service_del_postun ca-certificates.path ca-certificates.service ca-certificates-setup.service %clean rm -rf %{buildroot} @@ -133,7 +132,6 @@ 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