git: a57146c2cbd2 - main - security/intel-ipsec-mb: Update to 1.5

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 18 Nov 2023 09:27:13 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a57146c2cbd26e44f8f83d6a9df0204e53da1a14

commit a57146c2cbd26e44f8f83d6a9df0204e53da1a14
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-11-17 19:05:23 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-11-18 09:24:49 +0000

    security/intel-ipsec-mb: Update to 1.5
    
    * Switch to CMake
    * Backport upstream commit c266eb633019bf0eef2c9df1ce814f22b9ee2d51
    * Disable AES-NI emulation by default
    
    References:
    https://github.com/intel/intel-ipsec-mb/commit/c266eb633019bf0eef2c9df1ce814f22b9ee2d51
    
    PR:             275133
    Reviewed by:    Martin Filla <freebsd@sysctl.cz> (Maintainer)
---
 security/intel-ipsec-mb/Makefile                  | 31 +++++++----------------
 security/intel-ipsec-mb/distinfo                  |  8 +++---
 security/intel-ipsec-mb/files/patch-test_Makefile | 15 -----------
 3 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/security/intel-ipsec-mb/Makefile b/security/intel-ipsec-mb/Makefile
index 9a9a70b3d8ed..59e0d3666af1 100644
--- a/security/intel-ipsec-mb/Makefile
+++ b/security/intel-ipsec-mb/Makefile
@@ -1,8 +1,11 @@
 PORTNAME=	intel-ipsec-mb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3
+DISTVERSION=	1.5
 CATEGORIES=	security
 
+PATCH_SITES=	https://github.com/intel/${PORTNAME}/commit/
+PATCHFILES=	c266eb633019bf0eef2c9df1ce814f22b9ee2d51.patch:-p1
+
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Intel(R) Multi-Buffer Crypto for IPsec Library
 WWW=		https://github.com/intel/intel-ipsec-mb
@@ -14,40 +17,24 @@ ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	nasm:devel/nasm
 
-USES=		gmake compiler:c11 localbase:ldflags
-
+USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
-
 USE_LDCONFIG=	yes
 
+TEST_TARGET=	test
+
 PLIST_FILES=	include/intel-ipsec-mb.h \
 		lib/libIPSec_MB.so \
 		lib/libIPSec_MB.so.1 \
 		lib/libIPSec_MB.so.${DISTVERSION}.0 \
+		man/man7/libipsec-mb-dev.7.gz \
 		man/man7/libipsec-mb.7.gz
 
-# While parallel compiling works it can easily eat up 8+ Gb of RAM which will
-# result in unnecessary OOM errors
-MAKE_JOBS_UNSAFE=	yes
-
 OPTIONS_DEFINE=	AESNIEMU
-OPTIONS_DEFAULT=AESNIEMU
 
 AESNIEMU_DESC=	Enable AESI-NI Emulation
 
-AESNIEMU_MAKE_ARGS=	AESNI_EMU=y
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/intel-ipsec-mb.h ${STAGEDIR}${PREFIX}/include/
-	${INSTALL_LIB} ${WRKSRC}/lib/libIPSec_MB.so.${DISTVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.${DISTVERSION}.0
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.${DISTVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.1
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.${DISTVERSION}.0 ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so
-	${INSTALL_MAN} ${WRKSRC}/lib/libipsec-mb.7 ${STAGEDIR}${PREFIX}/man/man7
-
-do-test:
-	${RLN} ${WRKSRC}/lib/libIPSec_MB.so.${DISTVERSION}.0 ${WRKSRC}/test/libIPSec_MB.so.1
-	cd ${WRKSRC}/test && ./ipsec_xvalid_test -v
-	cd ${WRKSRC}/test && ./ipsec_MB_testapp --auto-detect
+AESNIEMU_CMAKE_BOOL=    AESNI_EMU
 
 .include <bsd.port.mk>
diff --git a/security/intel-ipsec-mb/distinfo b/security/intel-ipsec-mb/distinfo
index e7e6998a00c3..2e74896ac3ba 100644
--- a/security/intel-ipsec-mb/distinfo
+++ b/security/intel-ipsec-mb/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1664704976
-SHA256 (intel-intel-ipsec-mb-v1.3_GH0.tar.gz) = 2337ead1c80897e487abd5fac263aaba9ab9cacb48ad5c23b87fd61a180d9e55
-SIZE (intel-intel-ipsec-mb-v1.3_GH0.tar.gz) = 2139105
+TIMESTAMP = 1700159065
+SHA256 (intel-intel-ipsec-mb-v1.5_GH0.tar.gz) = 8d3f0a561b539303d81fda82584663daea65af85e07c40b393a4e8cfe839e057
+SIZE (intel-intel-ipsec-mb-v1.5_GH0.tar.gz) = 2214942
+SHA256 (c266eb633019bf0eef2c9df1ce814f22b9ee2d51.patch) = 5465147b13bbdcbc95eda31ad8e5e2ccff48ab2a755b74542d67c282deb88196
+SIZE (c266eb633019bf0eef2c9df1ce814f22b9ee2d51.patch) = 3542
diff --git a/security/intel-ipsec-mb/files/patch-test_Makefile b/security/intel-ipsec-mb/files/patch-test_Makefile
deleted file mode 100644
index c7a8371445f8..000000000000
--- a/security/intel-ipsec-mb/files/patch-test_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/Makefile.orig	2022-01-05 18:18:41 UTC
-+++ test/Makefile
-@@ -139,10 +139,10 @@ endif
- all: $(TEST_APP) $(XVALID_APP) $(FUZZ_APP)
- 
- $(TEST_APP): $(OBJECTS)
--	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -Wl,-rpath,. -o $@
- 
- $(XVALID_APP): $(XVALID_OBJECTS)
--	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -Wl,-rpath,. -o $@
- 
- $(FUZZ_APP): $(FUZZ_SOURCES)
- ifneq (, $(shell which clang))