app-crypt/intel-ipsec-mb: update to 1.3

Signed-off-by: Aisha Tammy <gentoo@aisha.cc>

4 files changed, 240 insertions, 2 deletions

diff --git a/app-crypt/intel-ipsec-mb/Manifest b/app-crypt/intel-ipsec-mb/Manifest
index 01c6d513a8..3a14699a29 100644
--- a/app-crypt/intel-ipsec-mb/Manifest
+++ b/app-crypt/intel-ipsec-mb/Manifest
@@ -1,2 +1,3 @@
 DIST intel-ipsec-mb-1.1.tar.gz 1227915 BLAKE2B 56d104c2bcebd4a8125d64362c14603b7005c8ef0978d4039da3128f06fbba7f469ac8df23e3315b9f3fe33c392804fd718a533edd34e4a545f767a1c2e2fd60 SHA512 aca5863d36b333c4c896549074242fb4c2c0a4d6598b27baa794944436527bdd6e1a5dbca9d39e0c3a89e61d7d175adcf5bf6c6cbdffd0a43bca1fea0be42ebe
 DIST intel-ipsec-mb-1.2.tar.gz 1251965 BLAKE2B f92172ea727f8c0a5beff6e8fe6bb1630b5e83ddffa7384b998ebb6dfe09fd2657203ab53358296ade0106240278f659c297c0897e2de364b434032a58f417b3 SHA512 dc566ea433f7c85109e833d1debb3c8dc3686b4c0562a00872dd9801ba3530bf87b7b382e167e7d5cec17c3b3535834cc5bdc78f349f501bdfe8920ee51532ac
+DIST intel-ipsec-mb-1.3.tar.gz 2139105 BLAKE2B f7ae09cb2721a0193879ee4a3a04fa6d190ebcd70c681a1f885554dbd644d39511cd0832eb22edc5566d72f0fcaba955450d2208b17a040f053aef6134e174b0 SHA512 4b91bffcd62f69245da90b70586df425fa6f17fa63d530b0cd09b990fb1ac4c85c2ebc8ed5d8952bd4b8a20e82c3b418e9ef4d61cfe1811af04f1ee16630ec67
diff --git a/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.3_remove-werror-and-O3.patch b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.3_remove-werror-and-O3.patch
new file mode 100644
index 0000000000..97ba6da0d7
--- /dev/null
+++ b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.3_remove-werror-and-O3.patch
@@ -0,0 +1,182 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index c592114..f2ea5b6 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -117,10 +117,10 @@ YASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I $i)
+ NASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I$i/)
+ ifneq ($(MINGW),0)
+ YASM_FLAGS := -f x64 -f win64 -X gnu -g dwarf2 -DWIN_ABI $(YASM_INCLUDES)
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES)
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES)
+ else
+ YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ $(YASM_INCLUDES)
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES)
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES)
+ endif
+ 
+ DEBUG_OPT ?= -O0
+@@ -170,7 +170,6 @@ endif
+ 
+ # prevent SIMD optimizations for non-aesni modules
+ CFLAGS_NO_SIMD = $(CFLAGS) -O1
+-CFLAGS += $(OPT)
+ 
+ # Set generic architectural optimizations
+ OPT_X86 := -msse4.2
+@@ -758,7 +757,7 @@ install: $(LIB_DIR)/$(LIBNAME)
+ 	install -m 0444 $(MAN2) $(MAN_DIR)
+ 	install -d $(LIB_INSTALL_DIR)
+ ifeq ($(SHARED),y)
+-	install -s -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
++	install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
+ else
+ 	# must not strip symbol table for static libs
+ 	install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
+diff --git a/lib/win_x64.mak b/lib/win_x64.mak
+index b33f5b1..69603d5 100644
+--- a/lib/win_x64.mak
++++ b/lib/win_x64.mak
+@@ -125,7 +125,7 @@ LINK_TOOL = link
+ LINKFLAGS = $(DLFLAGS) /nologo /machine:X64

+ 

+ AS = nasm

+-AFLAGS = $(DAFLAGS) -Werror -fwin64 -Xvc -DWIN_ABI -I.

++AFLAGS = $(DAFLAGS) -fwin64 -Xvc -DWIN_ABI -I.

+ 

+ # dependency

+ !ifndef DEPTOOL

+diff --git a/perf/Makefile b/perf/Makefile
+index f204e57..9db0818 100644
+--- a/perf/Makefile
++++ b/perf/Makefile
+@@ -45,9 +45,9 @@ endif
+ 
+ ifeq ($(MINGW),0)
+ CFLAGS += -DLINUX
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
+ else
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI
+ endif
+ 
+ # if "-z ibt" is supported then assume "-z shstk, -z cet-report=error" are also supported
+@@ -62,21 +62,21 @@ CFLAGS += -fcf-protection=full
+ endif
+ 
+ ifeq ($(MINGW),0)
+-LDFLAGS = -fPIE -z noexecstack -z relro -z now -pthread
++LDFLAGS += -fPIE -z noexecstack -z relro -z now -pthread
+ endif
+ ifeq ($(CC_HAS_CET),1)
+ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
+ endif
+ LDLIBS = -lIPSec_MB
+ 
+-ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes")
++#ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes")
+ # library installed
+-CFLAGS +=
+-else
++#CFLAGS +=
++#else
+ # library not installed
+ CFLAGS +=  -I../lib/include -I../lib
+ LDFLAGS += -L$(LIB_DIR)
+-endif
++#endif
+ 
+ DEBUG_OPT ?= -O0
+ ifeq ($(DEBUG),y)
+diff --git a/perf/win_x64.mak b/perf/win_x64.mak
+index 2f28549..3790e5f 100644
+--- a/perf/win_x64.mak
++++ b/perf/win_x64.mak
+@@ -69,7 +69,7 @@ LNK = link
+ LFLAGS = /out:$(APP).exe $(DLFLAGS)

+ 

+ AS = nasm

+-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI

++AFLAGS = -fwin64 -Xvc -DWIN_ABI

+ 

+ OBJECTS = ipsec_perf.obj msr.obj misc.obj

+ 

+diff --git a/test/Makefile b/test/Makefile
+index 72c0dc8..dfeb862 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -66,15 +66,15 @@ endif
+ YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__
+ ifeq ($(MINGW),0)
+ CFLAGS += -DLINUX
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
+ else
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI
+ endif
+ 
+ ifeq ($(MINGW),0)
+-LDFLAGS = -fPIE -z noexecstack -z relro -z now
++LDFLAGS += -fPIE -z noexecstack -z relro -z now
+ else
+-LDFLAGS = -fPIE
++LDFLAGS += -fPIE
+ endif
+ 
+ ifeq ($(CC_HAS_CET),1)
+@@ -82,14 +82,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
+ endif
+ LDLIBS = -lIPSec_MB
+ 
+-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
++#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
+ # library installed
+-CFLAGS +=
+-else
++#CFLAGS +=
++#else
+ # library not installed
+ CFLAGS +=  -I../lib/include -I../lib
+ LDFLAGS += -L$(LIB_DIR)
+-endif
++#endif
+ 
+ FUZZ_CFLAGS = -I../lib -L../lib $(CFLAGS) -g -fsanitize=fuzzer,address,leak
+ 
+diff --git a/test/win_x64.mak b/test/win_x64.mak
+index 67959bb..2b4585e 100644
+--- a/test/win_x64.mak
++++ b/test/win_x64.mak
+@@ -68,7 +68,7 @@ TEST_LFLAGS = /out:$(TEST_APP).exe $(DLFLAGS)
+ XVALID_LFLAGS = /out:$(XVALID_APP).exe $(DLFLAGS)

+ 

+ AS = nasm

+-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI

++AFLAGS = -fwin64 -Xvc -DWIN_ABI

+ 

+ # dependency

+ !ifndef DEPTOOL

+diff --git a/test/wycheproof/Makefile b/test/wycheproof/Makefile
+index faf051d..5b86b09 100644
+--- a/test/wycheproof/Makefile
++++ b/test/wycheproof/Makefile
+@@ -67,14 +67,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
+ endif
+ LDLIBS = -lIPSec_MB
+ 
+-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
++#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
+ # library installed
+-CFLAGS +=
+-else
++#CFLAGS +=
++#else
+ # library not installed
+ CFLAGS +=  -I../../lib
+ LDFLAGS += -L$(LIB_DIR)
+-endif
++#endif
+ 
+ DEBUG_OPT ?= -O0
+ ifeq ($(DEBUG),y)
diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.3.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.3.ebuild
new file mode 100644
index 0000000000..8f9457fefc
--- /dev/null
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-Buffer Crypto for IPSec from Intel"
+HOMEPAGE="https://github.com/intel/intel-ipsec-mb"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/intel/intel-ipsec-mb.git"
+else
+	SRC_URI="https://github.com/intel/intel-ipsec-mb/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+safe-data +safe-lookup +safe-param test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	>=dev-lang/nasm-2.13.03
+"
+
+PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" )
+
+src_configure(){
+	tc-export CC LD AR
+}
+
+src_compile() {
+	local myconf=(
+		SAFE_DATA=$(usex safe-data y n)
+		SAFE_LOOKUP=$(usex safe-lookup y n)
+		SAFE_PARAM=$(usex safe-param y n)
+	)
+	emake "${myconf[@]}" EXTRA_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" \
+		NOLDCONFIG=y \
+		LIB_INSTALL_DIR="${ED}/usr/$(get_libdir)" \
+		MAN_DIR="${ED}/usr/share/man/man7" \
+		install
+}
+
+src_test() {
+	cd "${S}/test"
+	LD_LIBRARY_PATH=../lib ./ipsec_MB_testapp -v
+	LD_LIBRARY_PATH=../lib ./ipsec_xvalid_test -v
+}
diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
index 4d8f17f15a..8f9457fefc 100644
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -25,7 +25,7 @@ BDEPEND="
 	>=dev-lang/nasm-2.13.03
 "
 
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" )
+PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" )
 
 src_configure(){
 	tc-export CC LD AR