From 67abcff944a274133411c8b91cca37044ca296be Mon Sep 17 00:00:00 2001
From: Christian Svensson <blue@cmd.nu>
Date: Sun, 2 Apr 2023 23:02:33 +0200
Subject: [PATCH] [nat] Switch to bullseye (#14495)

Change references to use bullseye instead of buster

Why I did it
Almost all daemons in 202211 and master uses bullseye, and NAT seems easy to migrate.

How I did it
Replaced the references, built with 202211 branch.

How to verify it
Not sure, it builds and tests pass as far as I can tell but I don't use the feature myself.

Signed-off-by: Christian Svensson <blue@cmd.nu>
---
 dockers/docker-nat/Dockerfile.j2 |  2 +-
 rules/docker-nat.mk              | 10 +++++-----
 rules/iptables.mk                |  8 ++++----
 src/iptables/Makefile            |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dockers/docker-nat/Dockerfile.j2 b/dockers/docker-nat/Dockerfile.j2
index 0c0e6089a8..23adcf3afa 100644
--- a/dockers/docker-nat/Dockerfile.j2
+++ b/dockers/docker-nat/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, copy_files %}
-FROM docker-swss-layer-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 
diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk
index 6e73ac9aec..3d2f2b0119 100644
--- a/rules/docker-nat.mk
+++ b/rules/docker-nat.mk
@@ -7,11 +7,11 @@ DOCKER_NAT_DBG = $(DOCKER_NAT_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_NAT)_PATH = $(DOCKERS_PATH)/$(DOCKER_NAT_STEM)
 
 $(DOCKER_NAT)_DEPENDS += $(SWSS) $(IPTABLESIP4TC) $(IPTABLESIP6TC) $(IPTABLESIPTC) $(IPXTABLES12) $(IPTABLES)
-$(DOCKER_NAT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
+$(DOCKER_NAT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS)
 $(DOCKER_NAT)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
-$(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
+$(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
 
 $(DOCKER_NAT)_VERSION = 1.0.0
 $(DOCKER_NAT)_PACKAGE_NAME = nat
@@ -37,5 +37,5 @@ $(DOCKER_NAT)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 
 $(DOCKER_NAT)_BASE_IMAGE_FILES += natctl:/usr/bin/natctl
 
-SONIC_BUSTER_DOCKERS += $(DOCKER_NAT)
-SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_NAT_DBG)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_NAT)
+SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_NAT_DBG)
diff --git a/rules/iptables.mk b/rules/iptables.mk
index fcdcc3434e..f8515f8949 100644
--- a/rules/iptables.mk
+++ b/rules/iptables.mk
@@ -1,17 +1,17 @@
 # iptables package
 
-IPTABLES_VERSION = 1.8.2
-IPTABLES_VERSION_SUFFIX = 4
+IPTABLES_VERSION = 1.8.7
+IPTABLES_VERSION_SUFFIX = 1
 IPTABLES_VERSION_FULL = $(IPTABLES_VERSION)-$(IPTABLES_VERSION_SUFFIX)
 
 IPTABLES = iptables_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(IPTABLES)_SRC_PATH = $(SRC_PATH)/iptables
 SONIC_MAKE_DEBS += $(IPTABLES)
 
-IPTABLESIP4TC = libip4tc0_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+IPTABLESIP4TC = libip4tc2_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(IPTABLES),$(IPTABLESIP4TC)))
 
-IPTABLESIP6TC = libip6tc0_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb
+IPTABLESIP6TC = libip6tc2_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(IPTABLES),$(IPTABLESIP6TC)))
 
 IPTABLESIPTC = libiptc0_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb
diff --git a/src/iptables/Makefile b/src/iptables/Makefile
index 07a8fea226..a048ea5a95 100644
--- a/src/iptables/Makefile
+++ b/src/iptables/Makefile
@@ -3,8 +3,8 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 MAIN_TARGET = $(IPTABLES)
-DERIVED_TARGETS = libip4tc0_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
-		  libip6tc0_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
+DERIVED_TARGETS = libip4tc2_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
+		  libip6tc2_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
 		  libiptc0_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
 		  libxtables12_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb