From nobody Wed Jan 05 23:43:54 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8CB8A19326FC; Wed, 5 Jan 2022 23:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JTmK624Xhz3vc7; Wed, 5 Jan 2022 23:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 279DD15553; Wed, 5 Jan 2022 23:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 205NhsY5005432; Wed, 5 Jan 2022 23:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205NhsAd005431; Wed, 5 Jan 2022 23:43:54 GMT (envelope-from git) Date: Wed, 5 Jan 2022 23:43:54 GMT Message-Id: <202201052343.205NhsAd005431@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 5d2007b1ed1c - main - security/intel-ipsec-mb: Update to 1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d2007b1ed1c42a8c28b7016f1d6cc6a4a608f79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641426234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9rZAOM70ord2nxRP2Pvql09NhBgSd5aMEzhEeyQ5vo=; b=EaNbpnJ7kT2aZbeveOqDqM/KUu367h5QzD9ehSQEKp78HkFQWDgovzBNLe+XXUWsiNc1aX svJGyKgWYImTmLBFtudXXhgeujUHdbwO2+NKr8AeH4hxcRdIPslty6d3epjWM3uoqfUqlK iISGv8+KICIFGVqNv8nDCO3/WrRiYVIJtDb1dM3SALYchTnHis+YoFezar3elhgkzLpnbs S5cNtjqzCiNpzsSjtJCKp8VmRKk3i8Xrb93U4jIVKJidHq/VwKtbwReDdQwYsxXemjc0NS 3OPcXUZ+ifgkGr3YqxFTO2ryCYx1+dLGLGgx4KjaxbgA6Nr/s1g3yCpp9pEADA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641426234; a=rsa-sha256; cv=none; b=xlHosgCv2tgsdvMWCW7Ta3vLBa/wuo1obOqOMjBfQj/jhz9jhf/R3nJDHJIQFBPmy89Byj DT8vhZHEYT0/LRmK/ASmFfAkf9pKt6h2ExvIr6Kb3WQ0R0r/MFKlx+PvDKUwGhLnMs5YIi y2/GQ4506y/fJdLw/BjkIBGi7ZmTGrINxqiCHSoY+WKFngYwrGbpZGxEV6m2Ok+wyW9t6k l56Lcv4BpBycT1b8m5apzMAF8xpwbs8BrSGjnx4qOIeafuquR8XA1fanak0g5WTbO/2LHe 8W+WMVD5rc1g9QY8n6ioQiTtSxHmKbPVUY0o+6Iqn4YIFHfsQ3brhbbnR0MJbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d2007b1ed1c42a8c28b7016f1d6cc6a4a608f79 commit 5d2007b1ed1c42a8c28b7016f1d6cc6a4a608f79 Author: Daniel Engberg AuthorDate: 2022-01-05 23:05:42 +0000 Commit: Daniel Engberg CommitDate: 2022-01-05 23:05:53 +0000 security/intel-ipsec-mb: Update to 1.1 Changelog: https://github.com/intel/intel-ipsec-mb/releases/tag/v1.1 Backport upstream commit 3a1c8c1c2c24a9d6cb56439c6aa6bea4d4fb1093 to fix compilation Set MAKE_JOBS_UNSAFE to avoid OOM issues Set rpath to avoid requirement of installing port to run test(s) PR: 260961 Reviewed by: Martin Filla (maintainer) --- security/intel-ipsec-mb/Makefile | 24 +++++++++++++++-------- security/intel-ipsec-mb/distinfo | 8 +++++--- security/intel-ipsec-mb/files/patch-test_Makefile | 15 ++++++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/security/intel-ipsec-mb/Makefile b/security/intel-ipsec-mb/Makefile index fb274b8104af..d68b50cde663 100644 --- a/security/intel-ipsec-mb/Makefile +++ b/security/intel-ipsec-mb/Makefile @@ -1,8 +1,11 @@ PORTNAME= intel-ipsec-mb -DISTVERSION= 0.55.0 -DISTVERSIONSUFFIX= -dev +DISTVERSIONPREFIX= v +DISTVERSION= 1.1 CATEGORIES= security +PATCH_SITES= https://github.com/intel/intel-ipsec-mb/commit/ +PATCHFILES= 3a1c8c1c2c24a9d6cb56439c6aa6bea4d4fb1093.patch:-p1 + MAINTAINER= freebsd@sysctl.cz COMMENT= Intel(R) Multi-Buffer Crypto for IPsec Library @@ -17,23 +20,28 @@ USES= gmake compiler:c11 localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= intel -GH_TAGNAME= 55179f0 USE_LDCONFIG= yes + PLIST_FILES= include/intel-ipsec-mb.h \ lib/libIPSec_MB.so \ - lib/libIPSec_MB.so.0 \ - lib/libIPSec_MB.so.${DISTVERSION} \ + lib/libIPSec_MB.so.1 \ + lib/libIPSec_MB.so.${DISTVERSION}.0 \ 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 + do-install: ${INSTALL_DATA} ${WRKSRC}/lib/intel-ipsec-mb.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_LIB} ${WRKSRC}/lib/libIPSec_MB.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.${DISTVERSION} - ${RLN} ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.0 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so.0 ${STAGEDIR}${PREFIX}/lib/libIPSec_MB.so + ${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 diff --git a/security/intel-ipsec-mb/distinfo b/security/intel-ipsec-mb/distinfo index bc7ce14a6be5..5e1d2ed8ce2e 100644 --- a/security/intel-ipsec-mb/distinfo +++ b/security/intel-ipsec-mb/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1605371320 -SHA256 (intel-intel-ipsec-mb-0.55.0-dev-55179f0_GH0.tar.gz) = acd90fae86dea1f86c7a8be649e0ab3981f7df9f4e80b1f2b922d5edc8ebcd87 -SIZE (intel-intel-ipsec-mb-0.55.0-dev-55179f0_GH0.tar.gz) = 1019534 +TIMESTAMP = 1641389422 +SHA256 (intel-intel-ipsec-mb-v1.1_GH0.tar.gz) = 0eed29151f57c98ed30fb899fab81438264bc5578bd7cc11d23ccc619af9beac +SIZE (intel-intel-ipsec-mb-v1.1_GH0.tar.gz) = 1227915 +SHA256 (3a1c8c1c2c24a9d6cb56439c6aa6bea4d4fb1093.patch) = 076d4069033ace59c3508f249cac095c09c6bffb449f6d0fc0772372e5803a17 +SIZE (3a1c8c1c2c24a9d6cb56439c6aa6bea4d4fb1093.patch) = 1811 diff --git a/security/intel-ipsec-mb/files/patch-test_Makefile b/security/intel-ipsec-mb/files/patch-test_Makefile new file mode 100644 index 000000000000..c7a8371445f8 --- /dev/null +++ b/security/intel-ipsec-mb/files/patch-test_Makefile @@ -0,0 +1,15 @@ +--- 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))