Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cups for openSUSE:Factory checked in
at 2022-12-10 21:17:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cups (Old)
and /work/SRC/openSUSE:Factory/.cups.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cups"
Sat Dec 10 21:17:35 2022 rev:165 rq:1041833 version:2.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cups/cups.changes 2022-07-26
19:42:58.753204145 +0200
+++ /work/SRC/openSUSE:Factory/.cups.new.1835/cups.changes 2022-12-10
21:17:51.433566624 +0100
@@ -1,0 +2,7 @@
+Thu Dec 8 14:30:12 UTC 2022 - Stefan Schubert <sch...@suse.com>
+
+- Migration PAM settings to /usr/etc: Saving user changed
+ configuration files in /etc and restoring them while an RPM
+ update.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups.spec ++++++
--- /var/tmp/diff_new_pack.7wc4kS/_old 2022-12-10 21:17:51.997569921 +0100
+++ /var/tmp/diff_new_pack.7wc4kS/_new 2022-12-10 21:17:52.001569945 +0100
@@ -409,7 +409,14 @@
install -d -m755 %{buildroot}%{_datadir}/cups/drivers
install -d -m755 %{buildroot}%{_localstatedir}/cache/cups
# Add conf/pam.suse regarding support for PAM (see Patch100: cups-pam.diff):
+%if 0%{?suse_version} > 1500
+install -d -m755 %{buildroot}%{_distconfdir}/pam.d
+install -m 644 -D conf/pam.suse %{buildroot}%{_distconfdir}/pam.d/cups
+# remove /etc/pam.d/cups from conf/pam.std
+rm -rf %{buildroot}%{_sysconfdir}/pam.d
+%else
install -m 644 -D conf/pam.suse %{buildroot}%{_sysconfdir}/pam.d/cups
+%endif
# Add missing usual documentation.
install -d -m755 %{buildroot}/%{_defaultdocdir}/cups
for f in CHANGES.md CREDITS.md INSTALL.md LICENSE README.md
@@ -490,6 +497,12 @@
%endif
%pre -p /bin/bash
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in pam.d/cups ; do
+ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
getent group ntadmin >/dev/null || %{_sbindir}/groupadd -g 71 -o -r ntadmin
%service_add_pre cups.service cups-lpd.socket cups.socket
@@ -558,6 +571,10 @@
systemctl --quiet disable $u 2>/dev/null || :
fi
done
+# Migration to /usr/etc, restore just created .rpmsave
+for i in pam.d/cups ; do
+ test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i} ||:
+done
exit 0
%post -n libcups2 -p /sbin/ldconfig
@@ -590,7 +607,11 @@
%config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cups-files.conf
%config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cupsd.conf
%config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/snmp.conf
+%if 0%{?suse_version} > 1500
+%config %{_distconfdir}/pam.d/cups
+%else
%config %{_sysconfdir}/pam.d/cups
+%endif
%dbus_config %{dbus_dir}/system.d/cups.conf
%config %{_sysconfdir}/cups/cupsd.conf.default
%config %{_sysconfdir}/cups/cups-files.conf.default
