Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked
in at 2023-02-11 22:20:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.1848 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit"
Sat Feb 11 22:20:08 2023 rev:28 rq:1064245 version:276.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2023-01-26
13:58:30.696170291 +0100
+++ /work/SRC/openSUSE:Factory/.cockpit.new.1848/cockpit.changes
2023-02-11 22:20:09.440062665 +0100
@@ -1,0 +2,5 @@
+Tue Feb 7 15:47:35 UTC 2023 - Stefan Schubert <sch...@suse.com>
+
+- Migration of PAM settings to /usr/lib/pam.d.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cockpit.spec ++++++
--- /var/tmp/diff_new_pack.9XmHG4/_old 2023-02-11 22:20:10.400068540 +0100
+++ /var/tmp/diff_new_pack.9XmHG4/_new 2023-02-11 22:20:10.444068809 +0100
@@ -230,8 +230,13 @@
# In obs we get write error: stdout
%make_install | tee make_install.log
make install-tests DESTDIR=%{buildroot}
+%if 0%{?suse_version} > 1500
+mkdir -p $RPM_BUILD_ROOT%{_pam_vendordir}
+install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_pam_vendordir}/cockpit
+%else
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
+%endif
rm -f %{buildroot}/%{_libdir}/cockpit/*.so
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
@@ -322,7 +327,12 @@
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls
cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop
cockpit-certificate-helper cockpit-certificate-ensure; do
rm %{buildroot}/%{_libexecdir}/$libexec
done
-rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d
%{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
+rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/motd.d
%{buildroot}/%{_sysconfdir}/issue.d
+%if 0%{?suse_version} > 1500
+rm -r %{buildroot}/%{_pam_vendordir}
+%else
+rm -r %{buildroot}/%{_sysconfdir}/pam.d
+%endif
rm %{buildroot}/usr/bin/cockpit-bridge
rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml
@@ -510,7 +520,11 @@
%doc %{_mandir}/man8/pam_ssh_add.8.gz
%dir %{_sysconfdir}/cockpit
%config(noreplace) %{_sysconfdir}/cockpit/ws-certs.d
+%if 0%{?suse_version} > 1500
+%{_pam_vendordir}/cockpit
+%else
%config(noreplace) %{_sysconfdir}/pam.d/cockpit
+%endif
# dir is not owned by pam in openSUSE
%dir %{_sysconfdir}/motd.d
# created in %post, so that users can rm the files
@@ -558,6 +572,12 @@
if %{_sbindir}/selinuxenabled 2>/dev/null; then
%selinux_relabel_pre -s %{selinuxtype}
fi
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/lib; save any old .rpmsave
+for i in pam.d/cockpit ; do
+ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
%post ws
if [ -x %{_sbindir}/selinuxenabled ]; then
@@ -608,6 +628,14 @@
%verify_permissions -e %{_libexecdir}/cockpit-session
%endif
+%if 0%{?suse_version} > 1500
+%posttrans ws
+# Migration to /usr/lib, restore just created .rpmsave
+for i in pam.d/cockpit ; do
+ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i} ||:
+done
+%endif
+
#
-------------------------------------------------------------------------------
# Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in
Fedora
