Revert "iptables: Enable nftables (#10786)" (#10814)

Author: christopherco

SPECS/ebtables/ebtables.spec

@@ -2,7 +2,7 @@
 
 Name:          ebtables
 Version:		   2.0.11
-Release:		   9%{?dist}
+Release:		   8%{?dist}
 Summary:		   Ethernet Bridge frame table administration tool
 License:		   GPLv2+
 URL:           http://ebtables.sourceforge.net/
@@ -35,9 +35,6 @@ like iptables. There are no known incompatibility issues.
 
 %package legacy
 Summary: Legacy user space tool to configure bridge netfilter rules in kernel
-Requires(post):   %{_sbindir}/update-alternatives
-Requires(post):   %{_bindir}/readlink
-Requires(postun): %{_sbindir}/update-alternatives
 Provides: ebtables
 
 %description legacy
@@ -93,22 +90,10 @@ rm %{buildroot}/%{_libdir}/libebtc.la
 # Drop these binaries (for now at least)
 rm %{buildroot}/%{_sbindir}/ebtables{d,u}
 
-# Prepare for Alternatives system
-touch %{buildroot}%{_sbindir}/ebtables
-touch %{buildroot}%{_sbindir}/ebtables-save
-touch %{buildroot}%{_sbindir}/ebtables-restore
-
-%post legacy
-pfx=%{_sbindir}/ebtables
-%{_sbindir}/update-alternatives --install %{_sbindir}/%{name} %{name} %{_sbindir}/%{name}-legacy 10000 \
-  --slave %{_sbindir}/%{name}-save %{name}-save %{_sbindir}/%{name}-legacy-save \
-  --slave %{_sbindir}/%{name}-restore %{name}-restore %{_sbindir}/%{name}-legacy-restore
-
-%postun legacy
-if [ $1 -eq 0 ]; then
-	%{_sbindir}/update-alternatives --remove \
-		%{name} %{_sbindir}/%{name}-legacy
-fi
+# Symlink ebtables-legacy to ebtables
+ln -sf ebtables-legacy %{buildroot}%{_sbindir}/ebtables
+ln -sf ebtables-legacy-save %{buildroot}%{_sbindir}/ebtables-save
+ln -sf ebtables-legacy-restore %{buildroot}%{_sbindir}/ebtables-restore
 
 %post services
 %systemd_post ebtables.service
@@ -123,10 +108,10 @@ fi
 %license COPYING
 %doc ChangeLog THANKS
 %{_sbindir}/ebtables-legacy*
+%{_sbindir}/ebtables*
 %{_mandir}/*/ebtables-legacy*
 %{_libdir}/libebtc.so*
 %{_sysconfdir}/ethertypes
-%ghost %{_sbindir}/ebtables{,-save,-restore}
 
 %files services
 %{_unitdir}/ebtables.service
@@ -135,9 +120,6 @@ fi
 %ghost %{_sysconfdir}/sysconfig/ebtables
 
 %changelog
-* Mon Oct 21 2024 Sumedh Sharma <sumsharma@microsoft.com> - 2.0.11-9
-- introduce alternatives for legacy
-
 * Tue Sep 03 2024 Neha Agarwal <nehaagarwal@microsoft.com> - 2.0.11-8
 - Add missing Vendor and Distribution tags.
 

SPECS/iptables/iptables.spec

@@ -1,7 +1,7 @@
 Summary:        Linux kernel packet control tool
 Name:           iptables
 Version:        1.8.10
-Release:        3%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -43,14 +43,15 @@ It contains the libraries and header files to create applications.
     --exec-prefix= \
     --with-xtlibdir=%{_libdir}/iptables \
     --with-pkgconfigdir=%{_libdir}/pkgconfig \
+    --disable-nftables \
     --enable-libipq \
     --enable-devel
 
-%make_build
+make V=0
 
 %install
 %make_install
-
+ln -sfv ../../sbin/xtables-multi %{buildroot}%{_libdir}/iptables-xml
 #   Install daemon scripts
 install -vdm755 %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
@@ -64,42 +65,14 @@ find %{buildroot} -name '*.a'  -delete
 find %{buildroot} -type f -name "*.la" -delete -print
 %{_fixperms} %{buildroot}/*
 
-ln -sf --relative %{buildroot}%{_sbindir}/xtables-legacy-multi %{buildroot}%{_bindir}/iptables-xml
+%preun
+%systemd_preun iptables.service
 
 %post
-for target in %{name} \
-              ip6tables \
-              ebtables \
-              arptables; do
-  alternatives --install %{_sbindir}/${target} ${target} %{_sbindir}/${target}-nft 30000 \
-    --slave %{_sbindir}/${target}-save ${target}-save %{_sbindir}/${target}-nft-save \
-    --slave %{_sbindir}/${target}-restore ${target}-restore %{_sbindir}/${target}-nft-restore
-done
-
-for target in %{name} \
-              ip6tables; do
-  alternatives --install %{_sbindir}/${target} ${target} %{_sbindir}/${target}-legacy 10000 \
-    --slave %{_sbindir}/${target}-save ${target}-save %{_sbindir}/${target}-legacy-save \
-    --slave %{_sbindir}/${target}-restore ${target}-restore %{_sbindir}/${target}-legacy-restore
-done
-
 /sbin/ldconfig
 %systemd_post iptables.service
 
-%preun
-%systemd_preun iptables.service
-
 %postun
-if [ $1 -eq 0 ]; then
-  for target in %{name} \
-              ip6tables \
-              ebtables \
-              arptables; do
-  alternatives --remove ${target} %{_sbindir}/${target}-nft
-  done
-  alternatives --remove %{name} %{_sbindir}/%{name}-legacy
-  alternatives --remove ip6tables %{_sbindir}/ip6tables-legacy
-fi
 /sbin/ldconfig
 %systemd_postun_with_restart iptables.service
 
@@ -110,18 +83,15 @@ fi
 %config(noreplace) %{_sysconfdir}/systemd/scripts/iptables.stop
 %config(noreplace) %{_sysconfdir}/systemd/scripts/ip4save
 %config(noreplace) %{_sysconfdir}/systemd/scripts/ip6save
-%config(noreplace) %{_sysconfdir}/ethertypes
 %{_unitdir}/iptables.service
 %{_sbindir}/*
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_libdir}/iptables/*
-%{_bindir}/iptables-xml
+%{_libdir}/iptables-xml
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 /usr/share/xtables/iptables.xslt
-%ghost %{_sbindir}/ip{,6}tables{,-save,-restore}
-%ghost %{_sbindir}/{eb,arp}tables{,-save,-restore}
 
 %files devel
 %{_libdir}/*.so
@@ -130,9 +100,6 @@ fi
 %{_mandir}/man3/*
 
 %changelog
-* Fri Oct 18 2024 Sumedh Sharma <sumsharma@microsoft.com> - 1.8.10-3
-- Enable nftables and use alternatives.
-
 * Mon Mar 18 2024 Andy Zaugg <azaugg@linkedin.com> - 1.8.10-2
 - Flush raw table when restarting iptables service