From nobody Sat Oct 28 21:02:53 2023 X-Original-To: dev-commits-ports-all@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 4SHsSF4WK9z4y2GT; Sat, 28 Oct 2023 21:02:53 +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 4SHsSF3dYKz4S5d; Sat, 28 Oct 2023 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526973; 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=/istDe+cVIdFXp8IUVbs/zdZU1zUmly/A85ngKEBkOs=; b=WMjT4KvfhnU1FjQvqX78rpY5ay1fDkq33q1J9LmAN8WcsBjAPQv44xs1ovSVuxrIMmeQ58 H6Q/vufwAIZ4AFiD5TeW2Laxo5YBOBd7223PTQd3UrtP89QD+ytMkD+DoGVMvYj74D9n0C E16AZRL+JQba88Cq0g82SAl8/ysNn46GnIetFFbrVvJDjxLxziZDw4LhqjgjN/gTxlEIzc CKK5OVanyi3Iv+hdjaJdpABRy6ukW04hQUi32uLnf3uYnHY/12Sk+pl2sGwuh22vExcN5N A/F2el7ccJLLG0GAr7iCgeEo5oywGFC0ktxzqKXJpc/njIPiHVhqn1jeJE5a+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698526973; 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=/istDe+cVIdFXp8IUVbs/zdZU1zUmly/A85ngKEBkOs=; b=QSxkb7VT1nAEzMV/OwPq8Qt/A5RvHRdjZzqKNDG39jinqK0a8lcTbd8oa+l9lKU0DJNWu8 CEhjagDXC6tv1NVFSycNfccAuuoaUipd4krBuRrMb90tffF8iOJgdfiG+tT0McYK/wnE69 emtRXiL5SwXT/ckHjku8Ee+vMZzuiSlGYHD4/SVMYcIpi1fLokLADTHCsKIDma5zKpu8dI RtC0YvcMQvq+Y0C3sqd+FMHTb5sD7J8nmMRWPIJpV10rVviLI9ZvQXRjPHogQyk71d7Z6D OwDPUr1O6zDnNUyinKBBCLtQYqIaQEcutvTrrarxAqaA7daIYo1mZVvzh5TjZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698526973; a=rsa-sha256; cv=none; b=rhEY0rplIMIGew2y4zoNA7RZyIxcwdQ7dWglzpFhzQ1M+x7riCS5/IjANQNYLl4PLgfa28 P2yvLqxSEO1YNlWDTHIAAHbgPnsyTVeT/i7oBoDqhUt6w1Td4GibZwn7+TMKzPGBoMAT3D y9b26+WHFqEbErkjx7zrXncATgKiEGaB6TzMewsjL87A/SMTQAs+5KT8nspeNwSjOlRtQm +3V66JgzBrFBhKy6A4+hiZk0VE6nim/Ff7cyTPnmk53REMskSx92hFU+43c/meODZBegnY XAkGG+c2DXFid5Xa/pkgQf8dCPfkm60kxFEvBd11wyxljJUk8smZIFeFtcEUMw== 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 4SHsSF2jXDz19t6; Sat, 28 Oct 2023 21:02:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39SL2rfU044159; Sat, 28 Oct 2023 21:02:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39SL2rUt044155; Sat, 28 Oct 2023 21:02:53 GMT (envelope-from git) Date: Sat, 28 Oct 2023 21:02:53 GMT Message-Id: <202310282102.39SL2rUt044155@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 294c9b880e27 - main - security/openssl31-quictls: Add QUIC enabled OpenSSL 3.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294c9b880e2714704d46f50430c71f5460d3b277 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=294c9b880e2714704d46f50430c71f5460d3b277 commit 294c9b880e2714704d46f50430c71f5460d3b277 Author: Bernard Spil AuthorDate: 2023-10-28 21:02:23 +0000 Commit: Bernard Spil CommitDate: 2023-10-28 21:02:23 +0000 security/openssl31-quictls: Add QUIC enabled OpenSSL 3.1 --- security/Makefile | 1 + security/openssl31-quictls/Makefile | 187 ++++++++++++++ security/openssl31-quictls/distinfo | 3 + .../files/extra-patch-util_find-doc-nits | 20 ++ security/openssl31-quictls/pkg-descr | 8 + security/openssl31-quictls/pkg-message | 20 ++ security/openssl31-quictls/pkg-plist | 276 +++++++++++++++++++++ security/openssl31-quictls/version.mk | 1 + 8 files changed, 516 insertions(+) diff --git a/security/Makefile b/security/Makefile index 6a9a8b3e540b..3cacd181325c 100644 --- a/security/Makefile +++ b/security/Makefile @@ -425,6 +425,7 @@ SUBDIR += openssl-unsafe SUBDIR += openssl111 SUBDIR += openssl31 + SUBDIR += openssl31-quictls SUBDIR += openssl32 SUBDIR += openvas SUBDIR += openvpn diff --git a/security/openssl31-quictls/Makefile b/security/openssl31-quictls/Makefile new file mode 100644 index 000000000000..59b16a176f69 --- /dev/null +++ b/security/openssl31-quictls/Makefile @@ -0,0 +1,187 @@ +PORTNAME= openssl +PORTVERSION= 3.1.4 +CATEGORIES= security devel +PKGNAMESUFFIX= 31-quictls + +MAINTAINER= brnrd@FreeBSD.org +COMMENT= QUIC capable fork of OpenSSL +WWW= https://www.github.com/quictls/openssl + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +CONFLICTS_INSTALL= boringssl libressl libressl-devel openssl openssl111 openssl3[12] + +BROKEN_i386= ld: error: undefined symbol: __atomic_is_lock_free + +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= config +CONFIGURE_ENV= PERL="${PERL}" +CONFIGURE_ARGS= --openssldir=${OPENSSLDIR} \ + --prefix=${PREFIX} + +USES= cpe perl5 +USE_PERL5= build +USE_GITHUB= yes +GH_ACCOUNT= ${PKGNAMESUFFIX:C/.*-//} +GH_TAGNAME= ${PORTNAME}-${PORTVERSION}-quic1 + +TEST_TARGET= test + +LDFLAGS_i386= -Wl,-znotext + +MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive CNF_LDFLAGS="${LDFLAGS}" +MAKE_ENV+= LIBRPATH="${PREFIX}/lib" GREP_OPTIONS= + +OPTIONS_GROUP= CIPHERS HASHES MODULES OPTIMIZE PROTOCOLS +OPTIONS_GROUP_CIPHERS= ARIA DES GOST IDEA SM4 RC2 RC4 RC5 WEAK-SSL-CIPHERS +OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160 SM2 SM3 +OPTIONS_GROUP_OPTIMIZE= ASM SSE2 THREADS +OPTIONS_GROUP_MODULES= FIPS LEGACY +OPTIONS_DEFINE_i386= I386 +OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2 + +OPTIONS_DEFINE= ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB + +OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST KTLS MAN3 MD4 NEXTPROTONEG \ + RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2 + +OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:} \ + ${${OSVERSION} > 1300000:?CRYPTODEV:} +OPTIONS_EXCLUDE_i386= FIPS + +OPTIONS_GROUP_OPTIMIZE_amd64= EC + +.if ${MACHINE_ARCH} == "amd64" +OPTIONS_GROUP_OPTIMIZE+= EC +.elif ${MACHINE_ARCH} == "mips64el" +OPTIONS_GROUP_OPTIMIZE+= EC +.endif + +OPTIONS_SUB= yes + +ARIA_DESC= ARIA (South Korean standard) +ASM_DESC= Assembler code +ASYNC_DESC= Asynchronous mode +CIPHERS_DESC= Block Cipher Support +CRYPTODEV_DESC= /dev/crypto support +CT_DESC= Certificate Transparency Support +DES_DESC= (Triple) Data Encryption Standard +EC_DESC= Optimize NIST elliptic curves +FIPS_DESC= Build FIPS provider (Note: NOT yet FIPS validated) +GOST_DESC= GOST (Russian standard) +HASHES_DESC= Hash Function Support +I386_DESC= i386 (instead of i486+) +IDEA_DESC= International Data Encryption Algorithm +KTLS_DESC= Use in-kernel TLS (FreeBSD >13) +LEGACY_DESC= Older algorithms +MAN3_DESC= Install API manpages (section 3, 7) +MD2_DESC= MD2 (obsolete) (requires LEGACY) +MD4_DESC= MD4 (unsafe) +MDC2_DESC= MDC-2 (patented, requires DES) +MODULES_DESC= Provider modules +NEXTPROTONEG_DESC= Next Protocol Negotiation (SPDY) +OPTIMIZE_DESC= Optimizations +PROTOCOLS_DESC= Protocol Support +RC2_DESC= RC2 (unsafe) +RC4_DESC= RC4 (unsafe) +RC5_DESC= RC5 (patented) +RMD160_DESC= RIPEMD-160 +RFC3779_DESC= RFC3779 support (BGP) +SCTP_DESC= SCTP (Stream Control Transmission) +SHARED_DESC= Build shared libraries +SM2_DESC= SM2 Elliptic Curve DH (Chinese standard) +SM3_DESC= SM3 256bit (Chinese standard) +SM4_DESC= SM4 128bit (Chinese standard) +SSE2_DESC= Runtime SSE2 detection +SSL3_DESC= SSLv3 (unsafe) +TLS1_DESC= TLSv1.0 (requires TLS1_1, TLS1_2) +TLS1_1_DESC= TLSv1.1 (requires TLS1_2) +TLS1_2_DESC= TLSv1.2 +WEAK-SSL-CIPHERS_DESC= Weak cipher support (unsafe) + +# Upstream default disabled options +.for _option in fips md2 ktls rc5 sctp ssl3 weak-ssl-ciphers zlib +${_option:tu}_CONFIGURE_ON= enable-${_option} +.endfor + +# Upstream default enabled options +.for _option in aria asm async ct des gost idea md4 mdc2 legacy \ + nextprotoneg rc2 rc4 rfc3779 rmd160 shared sm2 sm3 sm4 sse2 \ + threads tls1 tls1_1 tls1_2 +${_option:tu}_CONFIGURE_OFF= no-${_option} +.endfor + +MD2_IMPLIES= LEGACY +MDC2_IMPLIES= DES +TLS1_IMPLIES= TLS1_1 +TLS1_1_IMPLIES= TLS1_2 + +EC_CONFIGURE_ON= enable-ec_nistp_64_gcc_128 +FIPS_VARS= shlibs+=lib/ossl-modules/fips.so +I386_CONFIGURE_ON= 386 +LEGACY_VARS= shlibs+=lib/ossl-modules/legacy.so +MAN3_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-util_find-doc-nits +SHARED_MAKE_ENV= SHLIBVER=${OPENSSL_SHLIBVER} +SHARED_PLIST_SUB= SHLIBVER=${OPENSSL_SHLIBVER} +SHARED_USE= ldconfig=yes +SHARED_VARS= shlibs+="lib/libcrypto.so.${OPENSSL_SHLIBVER} \ + lib/libssl.so.${OPENSSL_SHLIBVER} \ + lib/engines-${OPENSSL_SHLIBVER}/capi.so \ + lib/engines-${OPENSSL_SHLIBVER}/devcrypto.so \ + lib/engines-${OPENSSL_SHLIBVER}/padlock.so" +SSL3_CONFIGURE_ON+= enable-ssl3-method +ZLIB_CONFIGURE_ON= zlib-dynamic + +SHLIBS= lib/engines-${OPENSSL_SHLIBVER}/loader_attic.so + +.include +.if ${PREFIX} == /usr +IGNORE= the OpenSSL port can not be installed over the base version +.endif + +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 && !${PORT_OPTIONS:MCRYPTODEV} +CONFIGURE_ARGS+= no-devcryptoeng +.endif + +OPENSSLDIR?= ${PREFIX}/openssl +PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==} + +.include "version.mk" + +.if ${PORT_OPTIONS:MASM} +BROKEN_sparc64= option ASM generates illegal instructions +.endif + +post-patch: + ${REINPLACE_CMD} -Ee 's|^MANDIR=.*$$|MANDIR=$$(INSTALLTOP)/man|' \ + -e 's|^(build\|install)_docs: .*|\1_docs: \1_man_docs|' \ + ${WRKSRC}/Configurations/unix-Makefile.tmpl + ${REINPLACE_CMD} 's|SHLIB_VERSION=81.3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \ + ${WRKSRC}/VERSION.dat + +post-configure: + ( cd ${WRKSRC} ; ${PERL} configdata.pm --dump ) + +post-configure-MAN3-off: + ${REINPLACE_CMD} \ + -e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \ + -e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \ + ${WRKSRC}/Makefile + +post-install-SHARED-on: +.for i in ${SHLIBS} + -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i +.endfor + +post-install-SHARED-off: + ${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-${OPENSSL_SHLIBVER} + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl + +post-install-MAN3-on: + ( cd ${STAGEDIR}/${PREFIX} ; find man/man3 -not -type d ; \ + find man/man7 -not -type d ) | sed 's/$$/.gz/' >> ${TMPPLIST} + +.include diff --git a/security/openssl31-quictls/distinfo b/security/openssl31-quictls/distinfo new file mode 100644 index 000000000000..79c828ab0e65 --- /dev/null +++ b/security/openssl31-quictls/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1698438879 +SHA256 (quictls-openssl-3.1.4-openssl-3.1.4-quic1_GH0.tar.gz) = 4bf990243d6aa39b8befa0c399834415842912ef67f88bef98e74dc619469618 +SIZE (quictls-openssl-3.1.4-openssl-3.1.4-quic1_GH0.tar.gz) = 15743124 diff --git a/security/openssl31-quictls/files/extra-patch-util_find-doc-nits b/security/openssl31-quictls/files/extra-patch-util_find-doc-nits new file mode 100644 index 000000000000..947f7447a445 --- /dev/null +++ b/security/openssl31-quictls/files/extra-patch-util_find-doc-nits @@ -0,0 +1,20 @@ +--- util/find-doc-nits.orig 2023-08-03 13:45:48 UTC ++++ util/find-doc-nits +@@ -80,7 +80,7 @@ my $temp = '/tmp/docnits.txt'; + my $OUT; + my $status = 0; + +-$opt_m = "man1,man3,man5,man7" unless $opt_m; ++$opt_m = "man1,man5" unless $opt_m; + die "Argument of -m option may contain only man1, man3, man5, and/or man7" + unless $opt_m =~ /^(man[1357][, ]?)*$/; + my @sections = ( split /[, ]/, $opt_m ); +@@ -725,7 +725,7 @@ sub check { + next if $target eq ''; # Skip if links within page, or + next if $target =~ /::/; # links to a Perl module, or + next if $target =~ /^https?:/; # is a URL link, or +- next if $target =~ /\([1357]\)$/; # it has a section ++ next if $target =~ /\([15]\)$/; # it has a section + err($id, "Missing man section number (likely, $mansect) in L<$target>") + } + # Check for proper links to commands. diff --git a/security/openssl31-quictls/pkg-descr b/security/openssl31-quictls/pkg-descr new file mode 100644 index 000000000000..0373df3f0b26 --- /dev/null +++ b/security/openssl31-quictls/pkg-descr @@ -0,0 +1,8 @@ +This is a fork of OpenSSL to enable QUIC. This fork adds API that can be +used by QUIC implementations for connection handshakes. + +There is a community need for a QUIC capable TLS library. This fork is +intended as stopgap solution to enable higher level frameworks and runtimes +to use QUIC with the proven and reliable TLS functionality from OpenSSL. +This fork will be maintained until OpenSSL officially provides reasonable +support for QUIC implementations. diff --git a/security/openssl31-quictls/pkg-message b/security/openssl31-quictls/pkg-message new file mode 100644 index 000000000000..7cd49c285a43 --- /dev/null +++ b/security/openssl31-quictls/pkg-message @@ -0,0 +1,20 @@ +[ +{ type: install + message: <