pool/firewalld
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1000602 from home:schubi2

Browse Source 
- Migration to /usr/etc: Saving user changed configuration files
  in /etc and restoring them while an RPM update.

OBS-URL: https://build.opensuse.org/request/show/1000602
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/firewalld?expand=0&rev=131
This commit is contained in:
Callum Farmer 2022-09-01 08:10:40 +00:00 committed by Git OBS Bridge
parent 2d03b1f242
commit aba3e0a056
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firewalld.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 1 07:55:30 UTC 2022 - Stefan Schubert <schubi@suse.com>
- Migration to /usr/etc: Saving user changed configuration files
in /etc and restoring them while an RPM update.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 2 09:17:56 UTC 2022 - Marcus Meissner <meissner@suse.com> Tue Aug 2 09:17:56 UTC 2022 - Marcus Meissner <meissner@suse.com>

18
firewalld.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package firewalld # spec file for package firewalld
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -43,14 +43,14 @@ BuildRequires: docbook-xsl-stylesheets
# Adding tools to BuildRequires as well so they can be autodetected # Adding tools to BuildRequires as well so they can be autodetected
# Else the configure tool will set them to /bin/false # Else the configure tool will set them to /bin/false
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: ebtables
BuildRequires: gettext BuildRequires: gettext
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gobject-introspection BuildRequires: gobject-introspection
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: intltool BuildRequires: intltool
BuildRequires: iptables
BuildRequires: ebtables
BuildRequires: ipset BuildRequires: ipset
BuildRequires: iptables
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -208,6 +208,12 @@ for _f in %{?modprobe_d_files}; do
[ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || : mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || :
done done
%if 0%{?suse_version} > 1500
# Prepare for migration to /usr/etc; save any old .rpmsave
for i in logrotate.d/firewalld ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%endif
%post %post
%service_add_post firewalld.service %service_add_post firewalld.service
@ -229,6 +235,12 @@ for _f in %{?modprobe_d_files}; do
[ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \
mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || : mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || :
done done
%if 0%{?suse_version} > 1500
# Migration to /usr/etc, restore just created .rpmsave
for i in logrotate.d/firewalld ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done
%endif
%post -n firewall-applet %post -n firewall-applet
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :