Merge remote-tracking branch 'origin/factory' into slfo-main

- Update to version 2+git20260203.5937e9f:
  * Remove files in /etc and /var from spec file [jsc#PED-14792]

OBS-URL: https://build.opensuse.org/request/show/1330779
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ca-certificates?expand=0&rev=56

.gitattributes

@@ -1,4 +1,4 @@
-## Default LFS
+*.changes merge=merge-changes
 *.7z filter=lfs diff=lfs merge=lfs -text
 *.bsp filter=lfs diff=lfs merge=lfs -text
 *.bz2 filter=lfs diff=lfs merge=lfs -text
@@ -12,6 +12,7 @@
 *.pdf filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.rpm filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
 *.tbz filter=lfs diff=lfs merge=lfs -text
 *.tbz2 filter=lfs diff=lfs merge=lfs -text
 *.tgz filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1 +1,4 @@
-.osc
+*.obscpio
+*.osc
+_build.*
+.pbuild

_servicedata

@@ -3,4 +3,4 @@
             <param name="url">http://github.com/openSUSE/ca-certificates.git</param>
           <param name="changesrevision">d16f02666b959e10f5bc64b6ab26b398f388ad0b</param></service><service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/ca-certificates.git</param>
-              <param name="changesrevision">fd24d504812a7c81940a3bd8e7620c9443018146</param></service></servicedata>
+              <param name="changesrevision">5937e9fb2e8b42e866a4b0bcaacbd05d7ffe086a</param></service></servicedata>

ca-certificates-2+git20260203.5937e9f.obscpio

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

ca-certificates.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Feb 03 13:33:23 UTC 2026 - Thorsten Kukuk <kukuk@suse.com>
+
+- Update to version 2+git20260203.5937e9f:
+  * Remove files in /etc and /var from spec file [jsc#PED-14792]
+
+-------------------------------------------------------------------
+Mon Oct 06 13:31:59 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
+
+- Update to version 2+git20251006.0b604c2:
+  * Sync directories with p11-kit [bsc#1251012]
+  * CI: Drop use of poetry
+
 -------------------------------------------------------------------
 Wed Aug 21 12:07:55 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
 

ca-certificates.obsinfo

@@ -1,4 +1,4 @@
 name: ca-certificates
-version: 2+git20240805.fd24d50
-mtime: 1722848060
-commit: fd24d504812a7c81940a3bd8e7620c9443018146
+version: 2+git20260203.5937e9f
+mtime: 1770124951
+commit: 5937e9fb2e8b42e866a4b0bcaacbd05d7ffe086a

ca-certificates.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ca-certificates
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,8 @@
 #
 
 
+%define cabundle  %{_localstatedir}/lib/ca-certificates/ca-bundle.pem
+
 %if 0%{?_build_in_place}
 %define git_version %(git log '-n1' '--date=format:%Y%m%d' '--no-show-signature' "--pretty=format:+git%cd.%h")
 BuildRequires:  git-core
@@ -32,31 +34,27 @@ BuildRequires:  git-core
 # on top of gnutls that we have to live with the bundle for now
 %bcond_without cabundle
 
-BuildRequires:  p11-kit-devel
-
 Name:           ca-certificates
-%define ssletcdir %{_sysconfdir}/ssl
-%define cabundle  /var/lib/ca-certificates/ca-bundle.pem
-%define sslcerts  %{ssletcdir}/certs
-Version:        2+git20240805.fd24d50%{git_version}
+Version:        2+git20260203.5937e9f%{git_version}
 Release:        0
 Summary:        Utilities for system wide CA certificate installation
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
-Source0:        ca-certificates-%{version}.tar
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 URL:            https://github.com/openSUSE/ca-certificates
+Source0:        ca-certificates-%{version}.tar
+BuildRequires:  p11-kit-devel
 #
-Requires:       /usr/bin/readlink
+Requires:       %{_bindir}/readlink
 Requires:       p11-kit
 Requires:       p11-kit-tools >= 0.23.1
 # needed for post
-Requires(post): p11-kit-tools /usr/bin/readlink
+Requires(post): %{_bindir}/readlink
+Requires(post): p11-kit-tools
 Recommends:     ca-certificates-mozilla
 # no need for a separate Java package anymore. The bundle is
 # created by C code.
 Obsoletes:      java-ca-certificates = 1
-Provides:       java-ca-certificates = %version-%release
+Provides:       java-ca-certificates = %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -74,73 +72,43 @@ certificate store that is managed by p11-kit.
 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}
-install -d -m 755 %{buildroot}%{ssletcdir}
-install -d -m 755 %{buildroot}/etc/ca-certificates/update.d
 install -d -m 755 %{buildroot}%{_prefix}/lib/ca-certificates/update.d
-install -d -m 555 %{buildroot}/var/lib/ca-certificates/pem
-install -d -m 555 %{buildroot}/var/lib/ca-certificates/openssl
+install -d -m 555 %{buildroot}%{_localstatedir}/lib/ca-certificates/pem
+install -d -m 555 %{buildroot}%{_localstatedir}/lib/ca-certificates/openssl
 install -d -m 755 %{buildroot}/%{_prefix}/lib/systemd/system
-ln -s ../../var/lib/ca-certificates/pem %{buildroot}%{sslcerts}
-%if %{with cabundle}
-install -D -m 444 /dev/null %{buildroot}/%{cabundle}
-ln -s %{cabundle} %{buildroot}%{ssletcdir}/ca-bundle.pem
-%endif
-install -D -m 444 /dev/null %{buildroot}/var/lib/ca-certificates/java-cacerts
 
 %pre
 %service_add_pre ca-certificates.path ca-certificates.service ca-certificates-setup.service
 
 %post
+%service_add_post ca-certificates.path ca-certificates.service ca-certificates-setup.service
+
+%posttrans
 # force rebuilding all certificate stores.
 update-ca-certificates -f || true
-%service_add_post ca-certificates.path ca-certificates.service ca-certificates-setup.service
 
 %preun
 %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
+	rm -rf %{_localstatedir}/lib/ca-certificates/pem %{_localstatedir}/lib/ca-certificates/openssl
 fi
 %service_del_postun ca-certificates.path ca-certificates.service ca-certificates-setup.service
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-, root, root)
 %license COPYING
 %doc README
-%dir %{pkidir_cfg}
-%dir %{trustdir_cfg}
-%dir %{trustdir_cfg}/anchors
-%dir %{trustdir_cfg}/blacklist
-%dir %{pkidir_static}
-%dir %{trustdir_static}
-%dir %{trustdir_static}/anchors
-%dir %{trustdir_static}/blacklist
-%dir %ssletcdir
-%sslcerts
-%ghost /var/lib/ca-certificates/java-cacerts
-%dir /etc/ca-certificates
-%dir /etc/ca-certificates/update.d
 %dir %{_prefix}/lib/ca-certificates
 %dir %{_prefix}/lib/ca-certificates/update.d
 %{_prefix}/lib/systemd/system/*
-%dir /var/lib/ca-certificates
-%dir /var/lib/ca-certificates/pem
-%dir /var/lib/ca-certificates/openssl
 %{_sbindir}/update-ca-certificates
-%{_mandir}/man8/update-ca-certificates.8*
+%{_mandir}/man8/update-ca-certificates.8%{?ext_man}
 %{_prefix}/lib/ca-certificates/update.d/*java.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