From 87036c34ec1bef4d42767e7f25d3e23fb95167df Mon Sep 17 00:00:00 2001
From: Ze Gan <ganze718@gmail.com>
Date: Sun, 17 Apr 2022 20:32:51 +0800
Subject: [PATCH] [macsec]: Upgrade docker-macsec to bullseye (#10574)

Following the patch from : https://packages.debian.org/bullseye/wpasupplicant, to upgrade sonic-wpa-supplicant for supporting bullseye and upgrade docker-macsec.mk as a bullseye component.
---
 dockers/docker-macsec/Dockerfile.j2    |  2 +-
 rules/docker-macsec.mk                 | 15 +++++++--------
 src/wpasupplicant/sonic-wpa-supplicant |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dockers/docker-macsec/Dockerfile.j2 b/dockers/docker-macsec/Dockerfile.j2
index 0239d65290..586983533e 100644
--- a/dockers/docker-macsec/Dockerfile.j2
+++ b/dockers/docker-macsec/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-swss-layer-buster
+FROM docker-config-engine-bullseye
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk
index 1cb14246e8..7250f79f90 100644
--- a/rules/docker-macsec.mk
+++ b/rules/docker-macsec.mk
@@ -6,14 +6,13 @@ DOCKER_MACSEC_DBG = $(DOCKER_MACSEC_STEM)-$(DBG_IMAGE_MARK).gz
 
 $(DOCKER_MACSEC)_PATH = $(DOCKERS_PATH)/$(DOCKER_MACSEC_STEM)
 
-$(DOCKER_MACSEC)_DEPENDS += $(SWSS) $(WPASUPPLICANT) $(REDIS_TOOLS) $(LIBNL3) $(LIBNL_GENL3) $(LIBNL_ROUTE3)
-$(DOCKER_MACSEC)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_DEPENDS)
-$(DOCKER_MACSEC)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
-$(DOCKER_MACSEC)_DBG_DEPENDS += $(WPASUPPLICANT_DBG)
+$(DOCKER_MACSEC)_DEPENDS += $(WPASUPPLICANT) $(LIBSWSSCOMMON) $(LIBNL3) $(LIBNL_GENL3) $(LIBNL_ROUTE3)
+$(DOCKER_MACSEC)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
+$(DOCKER_MACSEC)_DBG_DEPENDS += $(WPASUPPLICANT_DBG) $(LIBSWSSCOMMON_DBG)
 
-$(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_MACSEC)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BUSTER)
+$(DOCKER_MACSEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
 
 SONIC_DOCKER_IMAGES += $(DOCKER_MACSEC)
 ifeq ($(INCLUDE_MACSEC), y)
@@ -34,5 +33,5 @@ $(DOCKER_MACSEC)_RUN_OPT += -v /host/warmboot:/var/warmboot
 
 $(DOCKER_MACSEC)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 
-SONIC_BUSTER_DOCKERS += $(DOCKER_MACSEC)
-SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_MACSEC_DBG)
+SONIC_BULLSEYE_DOCKERS += $(DOCKER_MACSEC)
+SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_MACSEC_DBG)
diff --git a/src/wpasupplicant/sonic-wpa-supplicant b/src/wpasupplicant/sonic-wpa-supplicant
index 43611ef88e..f36c8c8770 160000
--- a/src/wpasupplicant/sonic-wpa-supplicant
+++ b/src/wpasupplicant/sonic-wpa-supplicant
@@ -1 +1 @@
-Subproject commit 43611ef88ea5c87f675cab55e3208c9f16bdd583
+Subproject commit f36c8c87702fa1bc6d1f9b7193872285a41bd630