svn commit: r567497 - in head/security: . openssl-quictls openssl-quictls/files

Sat Mar 6 14:54:50 UTC 2021

Author: brnrd
Date: Sat Mar  6 14:54:48 2021
New Revision: 567497
URL: https://svnweb.freebsd.org/changeset/ports/567497

Log:
  security/openssl-quictls: Add QUIC capable OpenSSL fork

Added:
  head/security/openssl-quictls/
     - copied from r566707, head/security/openssl-devel/
Deleted:
  head/security/openssl-quictls/files/pkg-message.in
Modified:
  head/security/Makefile
  head/security/openssl-quictls/Makefile
  head/security/openssl-quictls/distinfo
  head/security/openssl-quictls/pkg-descr
  head/security/openssl-quictls/pkg-message
  head/security/openssl-quictls/pkg-plist
  head/security/openssl-quictls/version.mk

Modified: head/security/Makefile
==============================================================================

--- head/security/Makefile	Sat Mar  6 14:36:46 2021	(r567496)
+++ head/security/Makefile	Sat Mar  6 14:54:48 2021	(r567497)
@@ -415,6 +415,7 @@
     SUBDIR += openssh-portable
     SUBDIR += openssl
     SUBDIR += openssl-devel
+    SUBDIR += openssl-quictls
     SUBDIR += openssl-unsafe
     SUBDIR += openssl_tpm_engine
     SUBDIR += openvas

Modified: head/security/openssl-quictls/Makefile
==============================================================================
--- head/security/openssl-devel/Makefile	Sat Feb 27 15:46:37 2021	(r566707)
+++ head/security/openssl-quictls/Makefile	Sat Mar  6 14:54:48 2021	(r567497)
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-DISTVERSION=	3.0.0-alpha12
+PORTVERSION=	3.0.0.a12
 CATEGORIES=	security devel
-MASTER_SITES=	https://www.openssl.org/source/ \
-		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
-PKGNAMESUFFIX=	-devel
+PKGNAMESUFFIX=	-quictls
 
 MAINTAINER=	brnrd at FreeBSD.org
-COMMENT=	TLSv1.3 capable SSL and crypto library
+COMMENT=	QUIC capable fork of OpenSSL
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
 			libressl-devel-[0-9]* \
-			openssl-[0-9]*
+			openssl-[0-9]* \
+			openssl-devel-[0-9]*
 
 BROKEN_i386=	ld: error: undefined symbol: __atomic_is_lock_free
 
@@ -28,6 +27,10 @@ CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
 
 USES=		cpe perl5
 USE_PERL5=	build
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PKGNAMESUFFIX:S/-//}
+GH_TAGNAME=	${PORTNAME}-3.0.0-alpha12+quic
+
 TEST_TARGET=	test
 
 LDFLAGS_i386=	-Wl,-znotext
@@ -49,6 +52,7 @@ OPTIONS_DEFAULT=ASM ASYNC CT DES EC FIPS GOST KTLS MAN
 		RC2 RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2
 
 OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:}
+OPTIONS_EXCLUDE_i386=	FIPS
 
 OPTIONS_GROUP_OPTIMIZE_amd64=	EC
 
@@ -151,7 +155,7 @@ 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=3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
+	${REINPLACE_CMD} 's|SHLIB_VERSION=18.3|SHLIB_VERSION=${OPENSSL_SHLIBVER}|' \
 		${WRKSRC}/VERSION.dat
 
 post-configure:
@@ -169,7 +173,7 @@ post-install-SHARED-on:
 .endfor
 
 post-install-SHARED-off:
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-12
+	${RMDIR} ${STAGEDIR}${PREFIX}/lib/engines-${OPENSSL_SHLIBVER}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/openssl

Modified: head/security/openssl-quictls/distinfo
==============================================================================
--- head/security/openssl-devel/distinfo	Sat Feb 27 15:46:37 2021	(r566707)
+++ head/security/openssl-quictls/distinfo	Sat Mar  6 14:54:48 2021	(r567497)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613665317
-SHA256 (openssl-3.0.0-alpha12.tar.gz) = 8d78239be66af578b969441252e7c125aa134ef3b9bac6179d84275cfe01950c
-SIZE (openssl-3.0.0-alpha12.tar.gz) = 14142492
+TIMESTAMP = 1614850981
+SHA256 (quictls-openssl-3.0.0.a12-openssl-3.0.0-alpha12+quic_GH0.tar.gz) = 37f61d1d122698d0c3806566b4022884fc5404b43e98a1542521ebe74e184907
+SIZE (quictls-openssl-3.0.0.a12-openssl-3.0.0-alpha12+quic_GH0.tar.gz) = 14293926

Modified: head/security/openssl-quictls/pkg-descr
==============================================================================
--- head/security/openssl-devel/pkg-descr	Sat Feb 27 15:46:37 2021	(r566707)
+++ head/security/openssl-quictls/pkg-descr	Sat Mar  6 14:54:48 2021	(r567497)
@@ -1,15 +1,10 @@
-The OpenSSL Project is a collaborative effort to develop a robust,
-commercial-grade, full-featured, and Open Source toolkit implementing
-the Secure Sockets Layer (SSL v3) and Transport Layer Security (TLS v1,
-v1.1, v1.2, v1.3) protocols with full-strength cryptography world-wide.
-The project is managed by a worldwide community of volunteers that use
-the Internet to communicate, plan, and develop the OpenSSL tookit
-and its related documentation.
+This is a fork of OpenSSL to enable QUIC. This fork adds API that can be 
+used by QUIC implementations for connection handshakes.
 
-OpenSSL is based on the excellent SSLeay library developed by Eric
-A. Young and Tim J. Hudson. The OpenSSL toolkit is licensed under
-an Apache-style licence, which basically means that you are free
-to get and use it for commercial and non-commercial purposes subject
-to some simple license conditions.
+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.
 
-WWW: https://www.openssl.org/
+WWW: https://www.github.com/quictls/openssl

Modified: head/security/openssl-quictls/pkg-message
==============================================================================
--- head/security/openssl-devel/pkg-message	Sat Feb 27 15:46:37 2021	(r566707)
+++ head/security/openssl-quictls/pkg-message	Sat Mar  6 14:54:48 2021	(r567497)
@@ -2,7 +2,7 @@
 { type: install
   message: <<EOM
 
-This OpenSSL version is in an ALPHA stage
+This QUIC capable OpenSSL fork is in an ALPHA stage
 
 Do NOT use for production!
 
@@ -11,7 +11,7 @@ EOM
 { type: upgrade
   message: <<EOM
 
-This OpenSSL version is in an ALPHA stage
+This QUIC capable OpenSSL fork is in an ALPHA stage
 
 Do NOT use for production!
 

Modified: head/security/openssl-quictls/pkg-plist
==============================================================================
--- head/security/openssl-devel/pkg-plist	Sat Feb 27 15:46:37 2021	(r566707)
+++ head/security/openssl-quictls/pkg-plist	Sat Mar  6 14:54:48 2021	(r567497)
@@ -624,6 +624,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_num_tickets.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_options.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_psk_client_callback.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_quic_method.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_quiet_shutdown.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_read_ahead.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_record_padding_callback.3.gz

Modified: head/security/openssl-quictls/version.mk
==============================================================================
--- head/security/openssl-devel/version.mk	Sat Feb 27 15:46:37 2021	(r566707)
+++ head/security/openssl-quictls/version.mk	Sat Mar  6 14:54:48 2021	(r567497)
@@ -1 +1 @@
-OPENSSL_SHLIBVER?=	12
+OPENSSL_SHLIBVER?=	13
