1 Commits

Author SHA256 Message Date
d92f034847 Sync changes to SLFO-1.2 branch 2025-08-20 09:28:37 +02:00
4 changed files with 57 additions and 13 deletions

View File

@@ -1,4 +0,0 @@
mtime: 1733147015
commit: 5f074bda5a10d96b965b4e60bd0f56762bb227d30bbb1c4b617012e3d6319e18
url: https://src.opensuse.org/jengelh/iptables
revision: master

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ce3e2d396879c4d7b973da79452b49fce1fd2544f9d7201785d25a63b893cd8
size 256

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Apr 28 19:46:06 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
- Provide ebtables for SLES16
-------------------------------------------------------------------
Thu Apr 17 18:48:56 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
- Remove legacy backend from SLES16
-------------------------------------------------------------------
Mon Dec 2 13:40:26 UTC 2024 - Antonio Teixeira <antonio.teixeira@suse.com>

View File

@@ -22,6 +22,12 @@
%bcond_with libalternatives
%endif
%if 0%{?suse_version} == 1600 && !0%{?is_opensuse}
%bcond_with legacy_backend
%else
%bcond_without legacy_backend
%endif
Name: iptables
Version: 1.8.11
Release: 0
@@ -51,6 +57,7 @@ BuildRequires: pkgconfig(libnfnetlink) >= 1.0.0
BuildRequires: pkgconfig(libnftnl) >= 1.2.6
Requires: netcfg >= 11.6
Requires: xtables-plugins = %version-%release
%if %{with legacy_backend}
%if %{with libalternatives}
Requires: alts
BuildRequires: alts
@@ -58,6 +65,11 @@ BuildRequires: alts
Requires(post): update-alternatives
Requires(postun): update-alternatives
%endif
%else
Provides: %{name}-backend-nft = %version-%release
Obsoletes: %{name}-backend-nft < %version-%release
Provides: ebtables
%endif
# During the update to iptables 1.8, ip6tables-restore-translate, ip6tables-translate,
# iptables-restore-translate and iptables-translate were moved from iptables-nft subpackage
# (now iptables-backend-nft) to the main package so we need to add a conflict here otherwise
@@ -68,6 +80,7 @@ Conflicts: iptables-nft = 1.6.2
iptables is used to set up, maintain, and inspect the rule tables of
the various Netfilter packet filter engines inside the Linux kernel.
%if %{with legacy_backend}
%package backend-nft
Summary: Metapackage to make nft the default backend for iptables/arptables/ebtables
Group: Productivity/Networking/Security
@@ -87,6 +100,7 @@ Installation of this package adds higher priority alternatives (cf.
update-alternatives) that makes the iptables, ip6tables, arptables
and ebtables commands point to a program variant that uses the
nftables kernel interface.
%endif
%package -n xtables-plugins
Summary: Match and target extension plugins for iptables
@@ -200,17 +214,29 @@ rm -f "$b/%_sysconfdir/xtables.conf" # packaging bug
for i in iptables iptables-restore iptables-save ip6tables ip6tables-restore \
ip6tables-save arptables arptables-restore arptables-save ebtables \
ebtables-restore ebtables-save; do
%if ! %{with libalternatives}
ln -fsv "%_sysconfdir/alternatives/$i" "$b/%_sbindir/$i"
%if %{with legacy_backend}
%if ! %{with libalternatives}
ln -fsv "%_sysconfdir/alternatives/$i" "$b/%_sbindir/$i"
%else
ln -fsv %_bindir/alts "$b/%_sbindir/$i"
%endif
%else
ln -fsv %_bindir/alts "$b/%_sbindir/$i"
ln -fsv %_sbindir/xtables-nft-multi "$b/%_sbindir/$i"
%endif
done
%if %{without legacy_backend}
rm "$b/%_sbindir/xtables-legacy-multi"
rm $b/%_sbindir/iptables-legacy*
rm $b/%_sbindir/ip6tables-legacy*
ln -fsv %_sbindir/xtables-nft-multi $b/%_bindir/iptables-xml
%endif
%if 0%{?suse_version}
%fdupes %buildroot/%_prefix
%endif
%if %{with legacy_backend}
%if %{with libalternatives}
mkdir -pv "$b/%_datadir/libalternatives/iptables"
cat >"$b/%_datadir/libalternatives/iptables/1.conf" <<-EOF
@@ -307,6 +333,7 @@ if test "$1" = 0; then
update-alternatives --remove ebtables "%_sbindir/xtables-nft-multi"
fi
%endif
%endif
%post -n libipq0 -p /sbin/ldconfig
%postun -n libipq0 -p /sbin/ldconfig
@@ -322,19 +349,22 @@ fi
%_bindir/iptables-xml
%_sbindir/arptables-*translate*
%_sbindir/iptables-apply
%_sbindir/iptables-legacy*
%_sbindir/iptables-nft*
%_sbindir/iptables-*translate*
%_sbindir/ip6tables-apply
%_sbindir/ip6tables-legacy*
%_sbindir/ip6tables-nft*
%_sbindir/ip6tables-*translate*
%_sbindir/arptables-nft*
%_sbindir/ebtables-nft*
%_sbindir/ebtables-*translate*
%_sbindir/xtables*
%_sbindir/xtables-monitor
%_sbindir/xtables-nft-multi
%_mandir/man1/*tables*
%_mandir/man8/*tables*
%if %{with legacy_backend}
%_sbindir/iptables-legacy*
%_sbindir/ip6tables-legacy*
%_sbindir/xtables-legacy-multi
# backend-legacy (implicit)
%if ! %{with libalternatives}
%ghost %_sysconfdir/alternatives/iptables
@@ -357,13 +387,23 @@ fi
%_datadir/libalternatives/iptables-save/1.conf
%dir %_datadir/libalternatives/iptables-save
%endif
%endif
%_sbindir/iptables
%_sbindir/iptables-restore
%_sbindir/iptables-save
%_sbindir/ip6tables
%_sbindir/ip6tables-restore
%_sbindir/ip6tables-save
%if %{without legacy_backend}
%_sbindir/arptables
%_sbindir/arptables-restore
%_sbindir/arptables-save
%_sbindir/ebtables
%_sbindir/ebtables-restore
%_sbindir/ebtables-save
%endif
%if %{with legacy_backend}
%files backend-nft
%if ! %{with libalternatives}
%ghost %_sysconfdir/alternatives/iptables
@@ -417,6 +457,7 @@ fi
%_sbindir/ebtables
%_sbindir/ebtables-restore
%_sbindir/ebtables-save
%endif
%files -n xtables-plugins
%_libdir/xtables/