From nobody Tue Sep 13 15:17:24 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 4MRnBr6R6Jz4cc7C; Tue, 13 Sep 2022 15:17:24 +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 4MRnBr5vBnz43jM; Tue, 13 Sep 2022 15:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663082244; 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=IJniyKWnQnx+WZegRPHQXUqPfRSyB5probb88/cnRXY=; b=u8GMWXC3QxOusb3UmhbYfOoUDPSSp0rkvdT7bn4LvcNFMnAncpFNvHZRJ+xJ/6OrkwiZja RmyrRLlnY4MdvAT7Ebo8hy9h/0BsleIcs3k4tMutC30EonSh3+GglAOMJIfw9nvMF0zYj8 L8xAuPVOZmDu6QDgFJd9kgjv83A5831d/zDNe/7gfUsEfjIHpPs6Dia0Trj0aE7oFxuEiJ 6lRjStj9/hHVuwZWRfhn4M7bvhzD3jm6j7ahOYwltWHn98+eI2hU5+AtSkJe8Du18mHRJL 7NpwZlax23JNHqgf1c4wyqZL1lbl8RDqs1ve8k4fOZeRIY1e5SIRwiSE7ttJMQ== 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 4MRnBr4j1kzMtH; Tue, 13 Sep 2022 15:17:24 +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 28DFHO6E069986; Tue, 13 Sep 2022 15:17:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DFHOM2069985; Tue, 13 Sep 2022 15:17:24 GMT (envelope-from git) Date: Tue, 13 Sep 2022 15:17:24 GMT Message-Id: <202209131517.28DFHOM2069985@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 79a0481d1c47 - main - security/s2n-tls: Various improvements 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79a0481d1c47b13fa8aa7b97803bea264e1fd13f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663082244; 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=IJniyKWnQnx+WZegRPHQXUqPfRSyB5probb88/cnRXY=; b=TteSg6nayMxOpfE71TjFnWKYBbU4SfjpOYJgWD4NbVAAS6W9+aA7bstzd/mRfT10pUHm9p kKgcPMnvRFbZck/GgEYCoRYLKRJxRD64JBZwKGK/JdZfTBnna+MTOvw49Db/sc3vgeMEMz xMJ6MDGY8584eRx8UlROjCD2qH3xw19XC+CbFFCSLVIGF4WMn9wdXDurTM3JMvV2vFU6Dj mtf8alNqqDU4kBL7Pf40+9HMg2lOpezYC5lx6Yra4n19DL62fBDeNKSiZT8kWOEIp5BWBO N3GYrjc03XWftT8LR6yWegrFyexWbYhNWo1GPbRq8ppJWBURypj1qIFrBsAMxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663082244; a=rsa-sha256; cv=none; b=vfZc2TbVPjaLR429lZKNdwzOkJW/cUh995O8WHbDQhkgO7E3ADpkBR6nYXODkh/4UyNXBQ dIUrGC08BR0usRpb0gDR5QNmLtxiutIWazgo3f/lHG9MBLyYdGUf8ugEslMCJfVzOIuZ+H StwCP/A8wDuROn8aLj6QRlLarZvTC0DJOt0qHFYQpR6sgKZFNkVKqeZ7HRNReFUqi7UIsI NOvMekxB7JRrZGrJVry3CI3ywmcO/d2azkBB+u5Nj3CrgDwPtIDGwaXs5MmBpLIBzDowNP Fjv0uhtmuH1hDGM+SpuiAsm/5b5QuPMLTWLhLhs6CsKp9tI4VzliW/3Z65yvtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=79a0481d1c47b13fa8aa7b97803bea264e1fd13f commit 79a0481d1c47b13fa8aa7b97803bea264e1fd13f Author: Daniel Engberg AuthorDate: 2022-09-13 15:08:48 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-13 15:16:48 +0000 security/s2n-tls: Various improvements - Define LICENSE_FILE - Use ports framework for unit testing - Add option for assembly optimization and LTO - Disable building tests by default - Disable assembly optimization by default (requires AVX2 and BMI2 support without runtime detection) - Use CMake helpers provided by framework - Rename s2n -> s2n-tls to match upstream name PR: 266397 --- MOVED | 1 + security/Makefile | 2 +- security/{s2n => s2n-tls}/Makefile | 24 +++++++++++++++--------- security/{s2n => s2n-tls}/distinfo | 0 security/{s2n => s2n-tls}/files/patch-bin_s2nd.c | 0 security/{s2n => s2n-tls}/files/pkg-message.in | 0 security/{s2n => s2n-tls}/pkg-descr | 0 security/{s2n => s2n-tls}/pkg-plist | 0 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/MOVED b/MOVED index 9cef5e7aa841..96d6c963bc58 100644 --- a/MOVED +++ b/MOVED @@ -17556,3 +17556,4 @@ graphics/drm-54-kmod|graphics/drm-510-kmod|2022-09-07|Obsolete, use graphics/drm archivers/ppmd-7z|archivers/7-zip|2022-09-11|ppmd-7z was a mis-named p7zip project that is unmaintained and has numerous vulnerabilities, users should use 7-zip instead science/R-cran-AMORE||2022-09-12|Has expired: Upstream no longer maintained www/moodle310|www/moodle311|2022-09-12|Has expired: Upstream no longer maintained, upgrade to next LTS +security/s2n|security/s2n-tls|2022-09-13|Moved to match upstream name diff --git a/security/Makefile b/security/Makefile index f431c2eac45e..f2313d2c6fb5 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1153,7 +1153,7 @@ SUBDIR += rubygem-webauthn SUBDIR += rubygem-webpush SUBDIR += rustscan - SUBDIR += s2n + SUBDIR += s2n-tls SUBDIR += safesh SUBDIR += samhain SUBDIR += samhain-client diff --git a/security/s2n/Makefile b/security/s2n-tls/Makefile similarity index 64% rename from security/s2n/Makefile rename to security/s2n-tls/Makefile index d0267dbb2dac..8c2480eff0e7 100644 --- a/security/s2n/Makefile +++ b/security/s2n-tls/Makefile @@ -1,6 +1,7 @@ -PORTNAME= s2n +PORTNAME= s2n-tls DISTVERSIONPREFIX= v DISTVERSION= 1.3.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security @@ -9,29 +10,34 @@ COMMENT= C99 implementation of the TLS/SSL protocols WWW= https://github.com/aws/s2n-tls LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake ssl +USES= cmake:testing ssl USE_GITHUB= yes GH_ACCOUNT= aws -GH_PROJECT= s2n-tls USE_LDCONFIG= yes -CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON +CMAKE_OFF= BUILD_TESTING +CMAKE_ON= BUILD_SHARED_LIBS SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS EXAMPLES TEST +OPTIONS_DEFINE= DOCS EXAMPLES LTO +OPTIONS_DEFINE_amd64= ASM +OPTIONS_DEFAULT= LTO + +ASM_DESC= Enable PQ crypto assembly (reqs AVX2 and BMI2 support) + +ASM_CMAKE_OFF= -DS2N_NO_PQ_ASM=1 +LTO_CMAKE_BOOL= S2N_LTO .include .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != arm && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 -CMAKE_ARGS+= -DS2N_NO_PQ:BOOL=ON +CMAKE_ON+= S2N_NO_PQ .endif -post-build-TEST-on: - (cd ${WRKDIR}/.build && ninja test) - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} -r ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} diff --git a/security/s2n/distinfo b/security/s2n-tls/distinfo similarity index 100% rename from security/s2n/distinfo rename to security/s2n-tls/distinfo diff --git a/security/s2n/files/patch-bin_s2nd.c b/security/s2n-tls/files/patch-bin_s2nd.c similarity index 100% rename from security/s2n/files/patch-bin_s2nd.c rename to security/s2n-tls/files/patch-bin_s2nd.c diff --git a/security/s2n/files/pkg-message.in b/security/s2n-tls/files/pkg-message.in similarity index 100% rename from security/s2n/files/pkg-message.in rename to security/s2n-tls/files/pkg-message.in diff --git a/security/s2n/pkg-descr b/security/s2n-tls/pkg-descr similarity index 100% rename from security/s2n/pkg-descr rename to security/s2n-tls/pkg-descr diff --git a/security/s2n/pkg-plist b/security/s2n-tls/pkg-plist similarity index 100% rename from security/s2n/pkg-plist rename to security/s2n-tls/pkg-plist