Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package firewalld for openSUSE:Factory checked in at 2022-03-11 21:40:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firewalld (Old) and /work/SRC/openSUSE:Factory/.firewalld.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "firewalld" Fri Mar 11 21:40:55 2022 rev:64 rq:960423 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/firewalld/firewalld.changes 2022-03-05 14:43:18.699699323 +0100 +++ /work/SRC/openSUSE:Factory/.firewalld.new.25692/firewalld.changes 2022-03-11 21:40:58.906057506 +0100 @@ -1,0 +2,11 @@ +Mon Mar 7 16:45:58 UTC 2022 - Martin Wilck <[email protected]> + +- Add code for safe modprobe.d migration + (https://en.opensuse.org/openSUSE:Packaging_UsrEtc) + +------------------------------------------------------------------- +Fri Mar 4 20:30:02 UTC 2022 - Martin Wilck <[email protected]> + +- Always own %_modprobedir (bsc#1196275, jsc#SLE-20639) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firewalld.spec ++++++ --- /var/tmp/diff_new_pack.o47jHb/_old 2022-03-11 21:40:59.410057893 +0100 +++ /var/tmp/diff_new_pack.o47jHb/_new 2022-03-11 21:40:59.418057899 +0100 @@ -24,6 +24,8 @@ # systemd-rpm-macros(or kmod) is wrong in 15.2 and 15.3 %define _modprobedir /lib/modprobe.d %endif +%global modprobe_d_files firewalld-sysctls.conf + Name: firewalld Version: 1.1.0 Release: 0 @@ -197,6 +199,11 @@ %pre %service_add_pre firewalld.service +# Avoid restoring outdated stuff in posttrans +for _f in %{?modprobe_d_files}; do + [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ + mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || : +done %post %service_add_post firewalld.service @@ -212,6 +219,13 @@ # Let the user restart it whenever he feels like it. %service_del_postun_without_restart firewalld.service +%posttrans +# Migration of modprobe.conf files to _modprobedir +for _f in %{?modprobe_d_files}; do + [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ + mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || : +done + %post -n firewall-applet /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -263,9 +277,7 @@ %{_datadir}/polkit-1 %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d -%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300 %dir %{_modprobedir} -%endif %{_modprobedir}/firewalld-sysctls.conf %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf %config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
