From 4942c2c910b5ed723fda247ab1f2d7b5f3041709 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Wed, 11 Jan 2023 12:46:38 +0800
Subject: [PATCH] fix iptables-nft post scriptlet fail

Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
 iptables.spec | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/iptables.spec b/iptables.spec
index bee7140..d8b5f98 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,5 +1,5 @@
 # install init scripts to /usr/libexec with systemd
-%define anolis_release 3
+%define anolis_release 4
 %global script_path %{_libexecdir}/iptables
 %global legacy_actions %{_libexecdir}/initscripts/legacy-actions
 %global iptc_so_ver  0
@@ -279,6 +279,7 @@ pfx6=%{_sbindir}/ip6tables
 	--slave $pfx6-restore ip6tables-restore $pfx6-nft-restore \
 	--slave $pfx6-save ip6tables-save $pfx6-nft-save
 
+rm -f /var/lib/alternatives/ebtables
 pfx=%{_sbindir}/ebtables
 manpfx=%{_mandir}/man8/ebtables
 for sfx in "" "-restore" "-save"; do
@@ -286,15 +287,16 @@ for sfx in "" "-restore" "-save"; do
 		rm -f $pfx$sfx
 	fi
 done
-if [ "$(readlink -e $manpfx.8.zstd" == $manpfx.8.zstd ]; then
-	rm -f $manpfx.8.zstd
+if [ "$(readlink -e $manpfx.8.zst)" == $manpfx.8.zst ]; then
+	rm -f $manpfx.8.zst
 fi
 %{_sbindir}/update-alternatives --install \
 	$pfx ebtables $pfx-nft 10 \
 	--slave $pfx-save ebtables-save $pfx-nft-save \
 	--slave $pfx-restore ebtables-restore $pfx-nft-restore \
-	--slave $manpfx.8.zstd ebtables-man $manpfx-nft.8.zstd
+	--slave $manpfx.8.zst ebtables-man $manpfx-nft.8.zst
 
+rm -f /var/lib/alternatives/arptables
 pfx=%{_sbindir}/arptables
 manpfx=%{_mandir}/man8/arptables
 lepfx=%{_libexecdir}/arptables
@@ -302,8 +304,8 @@ for sfx in "" "-restore" "-save"; do
 	if [ "$(readlink -e $pfx$sfx)" == $pfx$sfx ]; then
 		rm -f $pfx$sfx
 	fi
-	if [ "$(readlink -e $manpfx$sfx.8.zstd)" == $manpfx$sfx.8.zstd ]; then
-		rm -f $manpfx$sfx.8.zstd
+	if [ "$(readlink -e $manpfx$sfx.8.zst)" == $manpfx$sfx.8.zst ]; then
+		rm -f $manpfx$sfx.8.zst
 	fi
 done
 if [ "$(readlink -e $lepfx-helper)" == $lepfx-helper ]; then
@@ -313,9 +315,9 @@ fi
 	$pfx arptables $pfx-nft 10 \
 	--slave $pfx-save arptables-save $pfx-nft-save \
 	--slave $pfx-restore arptables-restore $pfx-nft-restore \
-	--slave $manpfx.8.zstd arptables-man $manpfx-nft.8.zstd \
-	--slave $manpfx-save.8.zstd arptables-save-man $manpfx-nft-save.8.zstd \
-	--slave $manpfx-restore.8.zstd arptables-restore-man $manpfx-nft-restore.8.zstd \
+	--slave $manpfx.8.zst arptables-man $manpfx-nft.8.zst \
+	--slave $manpfx-save.8.zst arptables-save-man $manpfx-nft-save.8.zst \
+	--slave $manpfx-restore.8.zst arptables-restore-man $manpfx-nft-restore.8.zst \
 	--slave $lepfx-helper arptables-helper $lepfx-nft-helper
 
 %postun nft
@@ -406,6 +408,9 @@ fi
 
 
 %changelog
+* Wed Jan 11 2023 Chunmei Xu <xuchunmei@linux.alibaba.com> - 1.8.8-4
+- fix iptables-nft post scriptlet fail
+
 * Tue Jan 3 2023 Funda Wang <fundawang@yeah.net> - 1.8.8-3
 - Rebuild for new libnfnetlink
 
-- 
Gitee