From 35e54647fbe99d3d5abc34806e472dad0d72dec9 Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 20 Aug 2020 08:07:46 -0400
Subject: [PATCH] intel-ipsec-mb: update submodule to v0.54

Updated required NASM version to 2.14,
since intel-ipsec-mb v0.54 now requires it.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I10cee6aea941593b828a6a171297d7e997d0f30c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3868
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 CHANGELOG.md             | 4 ++++
 configure                | 8 ++++----
 intel-ipsec-mb           | 2 +-
 scripts/pkgdep/debian.sh | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75573e2957..6ed2fb5d00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ bdev explicitly. It can be used only if auto_examine is disabled.
 
 Updated DPDK submodule to DPDK 20.08.
 
+### intel-ipsec-mb
+
+Updated intel-ipsec-mb submodule to v0.54
+
 ### isa-l
 
 Updated ISA-L submodule to v2.29.0.
diff --git a/configure b/configure
index 7876ea7056..136a2c1d3e 100755
--- a/configure
+++ b/configure
@@ -163,14 +163,14 @@ fi
 #check nasm only on x86
 if [[ $arch == x86_64* ]]; then
 	ver=$(nasm -v 2>/dev/null | awk '{print $3}' | sed 's/[^0-9]*//g')
-	if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "213" ]] && [[ "${ver:0:5}" -lt "21303" ]]; then
-		# ISA-L, compression & crypto require NASM version 2.13.03 or newer.
+	if [[ "${ver:0:1}" -le "2" ]] && [[ "${ver:0:3}" -le "214" ]] && [[ "${ver:0:5}" -lt "21400" ]]; then
+		# ISA-L, compression & crypto require NASM version 2.14 or newer.
 		CONFIG[ISAL]=n
 		CONFIG[CRYPTO]=n
 		CONFIG[IPSEC_MB]=n
 		CONFIG[REDUCE]=n
 		HAVE_NASM=n
-		echo "Notice: ISA-L, compression & crypto require NASM version 2.13.03 or newer. Turning off default ISA-L and crypto features."
+		echo "Notice: ISA-L, compression & crypto require NASM version 2.14 or newer. Turning off default ISA-L and crypto features."
 	else
 		HAVE_NASM=y
 	fi
@@ -649,7 +649,7 @@ fi
 
 if [[ "${CONFIG[ISAL]}" = "y" ]] || [[ "${CONFIG[CRYPTO]}" = "y" ]]; then
 	if [[ "${HAVE_NASM}" = "n" ]] && [[ $arch == x86_64* ]]; then
-		echo "ERROR: ISA-L, compression & crypto require NASM version 2.13.03 or newer."
+		echo "ERROR: ISA-L, compression & crypto require NASM version 2.14 or newer."
 		echo "Please install or upgrade them re-run this script."
 		exit 1
 	else
diff --git a/intel-ipsec-mb b/intel-ipsec-mb
index 997d553615..93c2ddf877 160000
--- a/intel-ipsec-mb
+++ b/intel-ipsec-mb
@@ -1 +1 @@
-Subproject commit 997d553615b5b75b309093b359d8710d8d2f11c8
+Subproject commit 93c2ddf877532f499a79e7111c9d9532cb44ceaf
diff --git a/scripts/pkgdep/debian.sh b/scripts/pkgdep/debian.sh
index fd239602e7..7743c2ebc4 100755
--- a/scripts/pkgdep/debian.sh
+++ b/scripts/pkgdep/debian.sh
@@ -13,7 +13,7 @@ apt-get install -y python3-configshell-fb python3-pexpect || echo \
 
 # Additional dependencies for DPDK
 if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -lt 1900 ]]; then
-	echo "Ubuntu $VERSION_ID needs NASM version 2.13.03 for DPDK but is not in the mainline repository."
+	echo "Ubuntu $VERSION_ID needs NASM version 2.14 for DPDK but is not in the mainline repository."
 	echo "You can install it manually"
 else
 	apt-get install -y nasm