Accepting request 959443 from security:netfilter

OBS-URL: https://build.opensuse.org/request/show/959443
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/firewalld?expand=0&rev=63
This commit is contained in:
Dominique Leuenberger 2022-03-05 13:43:08 +00:00 committed by Git OBS Bridge
commit 2629c8fc50
2 changed files with 17 additions and 10 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Mar 3 14:26:57 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
- Fix modprobe.d directory for SLE15 SP3
- Cleanup dependencies:
- ipset, ebtables and iptables are purely optional and deprecated,
so don't require them
- sysconfig is not needed at all
- Don't hard require systemd, we don't have and need that in containers
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 26 14:35:35 UTC 2022 - Callum Farmer <gmbr3@opensuse.org> Sat Feb 26 14:35:35 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -20,8 +20,8 @@
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300 %if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150400
# systemd-rpm-macros(or kmod) is wrong in 15.2 # systemd-rpm-macros(or kmod) is wrong in 15.2 and 15.3
%define _modprobedir /lib/modprobe.d %define _modprobedir /lib/modprobe.d
%endif %endif
Name: firewalld Name: firewalld
@ -39,7 +39,7 @@ BuildRequires: automake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: docbook-xsl-stylesheets 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
# even though it is probably unlikely for paths to change in the future # Else the configure tool will set them to /bin/false
BuildRequires: ebtables BuildRequires: ebtables
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gettext BuildRequires: gettext
@ -50,22 +50,19 @@ BuildRequires: intltool
BuildRequires: ipset BuildRequires: ipset
BuildRequires: iptables BuildRequires: iptables
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
BuildRequires: nftables
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
Requires: ebtables Recommends: logrotate
Requires: ipset # Workaround: nftables seems to be a python3-nftables requirement,
Requires: iptables # not of firewalld.
Requires: logrotate
Requires: nftables Requires: nftables
Requires: python3-firewall = %{version} Requires: python3-firewall = %{version}
Requires: python3-gobject Requires: python3-gobject
Requires: python3-nftables Requires: python3-nftables
Requires: sysconfig
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Suggests: susefirewall2-to-firewalld Suggests: susefirewall2-to-firewalld
BuildArch: noarch BuildArch: noarch
%{?systemd_requires} %{?systemd_ordering}
%description %description
firewalld is a firewall service daemon that provides a dynamic customizable firewalld is a firewall service daemon that provides a dynamic customizable