svn commit: r521749 - in head: net-mgmt/net-snmp security/botan110 security/dsniff security/libressl security/libressl-devel security/openca-tools-forked security/p5-Crypt-OpenSSL-CA security/p5-Op...

Wed Jan 1 17:30:23 UTC 2020

Author: brnrd
Date: Wed Jan  1 17:30:19 2020
New Revision: 521749
URL: https://svnweb.freebsd.org/changeset/ports/521749

Log:
  Chase rename of security/openssl111
  
   - Categories n-z
  
  MFH:		2020Q1

Modified:
  head/net-mgmt/net-snmp/Makefile
  head/security/botan110/Makefile
  head/security/dsniff/Makefile
  head/security/libressl-devel/Makefile
  head/security/libressl/Makefile
  head/security/openca-tools-forked/Makefile
  head/security/p5-Crypt-OpenSSL-CA/Makefile
  head/security/p5-OpenCA-OpenSSL/Makefile
  head/security/pks/Makefile
  head/security/racoon2/Makefile
  head/security/softhsm2/Makefile
  head/security/sslscan/Makefile
  head/sysutils/cfengine310/Makefile
  head/sysutils/cfengine311/Makefile
  head/sysutils/ipmitool/Makefile
  head/textproc/libucl/Makefile
  head/www/envoy/Makefile
  head/www/squid3/Makefile

Modified: head/net-mgmt/net-snmp/Makefile
==============================================================================

--- head/net-mgmt/net-snmp/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/net-mgmt/net-snmp/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -74,7 +74,7 @@ TLS_CONFIGURE_ON=	--with-security-modules=tsm --with-t
 
 .include <bsd.port.options.mk>
 
-.if (${OSVERSION} >= 1200085 || ${SSL_DEFAULT:Mopenssl111*})
+.if (${OSVERSION} >= 1200085 || ${SSL_DEFAULT:Mopenssl*})
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-openssl11
 .endif
 
@@ -249,7 +249,7 @@ post-patch:
 	    ${WRKSRC}/agent/mibgroup/host/hr_system.c
 	@${REINPLACE_CMD} -E -e 's|return pci_lookup_name|disabled broken|g' \
 		${WRKSRC}/configure
-.if (${OSVERSION} >= 1200085 || ${SSL_DEFAULT:Mopenssl111*})
+.if (${OSVERSION} >= 1200085 || ${SSL_DEFAULT:Mopenssl*})
 	@${REINPLACE_CMD} -E -e 's|SSL_library_init|OPENSSL_init_ssl|g' \
 		${WRKSRC}/configure
 .endif

Modified: head/security/botan110/Makefile
==============================================================================
--- head/security/botan110/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/botan110/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -42,7 +42,7 @@ GMP_CONFIGURE_WITH=	gnump
 
 .include <bsd.port.pre.mk>
 
-.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200084) || ${SSL_DEFAULT:Mopenssl111} || ${SSL_DEFAULT:M*-devel}
+.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200084) || ${SSL_DEFAULT:Mopenssl} || ${SSL_DEFAULT:M*-devel}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-openssl11
 .endif
 

Modified: head/security/dsniff/Makefile
==============================================================================
--- head/security/dsniff/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/dsniff/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -39,7 +39,7 @@ X11_CONFIGURE_WITH=x
 USES+=		ssl
 .endif
 
-.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT} == openssl111
+.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT} == openssl
 # Requires LibreSSL for old SSL interface
 BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
 CPPFLAGS+=		-nostdinc -I/usr/include -I${WRKDIR}/libressl/include
@@ -52,8 +52,8 @@ pre-configure:
 	@cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \
 	    && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1
 .else
-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct rsa_st'
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	incomplete definition of type 'struct rsa_st'
 .endif
 
 post-patch:

Modified: head/security/libressl-devel/Makefile
==============================================================================
--- head/security/libressl-devel/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/libressl-devel/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -22,8 +22,7 @@ NC_DESC=	Install TLS-enabled netcat
 TLS1_3_DESC=	TLSv1.3 support (experimental)
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
-			openssl-[0-9]* \
-			openssl111-[0-9]*
+			openssl-[0-9]*
 
 NC_CONFIGURE_ENABLE=	nc
 

Modified: head/security/libressl/Makefile
==============================================================================
--- head/security/libressl/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/libressl/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -20,8 +20,7 @@ MAN3_DESC=	Install API manpages (section 3)
 NC_DESC=	Install TLS-enabled netcat
 
 CONFLICTS_INSTALL=	libressl-devel-[0-9]* \
-			openssl-[0-9]* \
-			openssl111-[0-9]*
+			openssl-[0-9]*
 
 NC_CONFIGURE_ENABLE=	nc
 

Modified: head/security/openca-tools-forked/Makefile
==============================================================================
--- head/security/openca-tools-forked/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/openca-tools-forked/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -12,7 +12,7 @@ COMMENT=	Tools to deal with SCEP and PKCS7 messages
 
 LICENSE=	APACHE20
 
-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl
 
 USES=		gmake perl5 ssl
 

Modified: head/security/p5-Crypt-OpenSSL-CA/Makefile
==============================================================================
--- head/security/p5-Crypt-OpenSSL-CA/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/p5-Crypt-OpenSSL-CA/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -27,7 +27,7 @@ RUN_DEPENDS=	p5-Convert-ASN1>=0.02:converters/p5-Conve
 TEST_DEPENDS=	p5-Test-Group>=0:devel/p5-Test-Group \
 		p5-Test-Taint>=0:devel/p5-Test-Taint
 
-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl
 
 USES=		perl5 ssl
 USE_PERL5=	modbuild

Modified: head/security/p5-OpenCA-OpenSSL/Makefile
==============================================================================
--- head/security/p5-OpenCA-OpenSSL/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/p5-OpenCA-OpenSSL/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -12,8 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl at FreeBSD.org
 COMMENT=	Perl crypto extension to OpenSSL
 
-BROKEN_SSL=    openssl111 ${BROKEN_SSL_${OSREL:R}}
-BROKEN_SSL_REASON_openssl111=  incomplete definition of type 'struct x509_st'
+BROKEN_SSL=    openssl ${BROKEN_SSL_${OSREL:R}}
+BROKEN_SSL_REASON_openssl=  incomplete definition of type 'struct x509_st'
 BROKEN_SSL_12=	base
 BROKEN_SSL_13=	base
 

Modified: head/security/pks/Makefile
==============================================================================
--- head/security/pks/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/pks/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -14,8 +14,8 @@ COMMENT=	PGP Public Key Server
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st')
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st')
 
 USES=		bdb ssl
 USE_GCC=	any

Modified: head/security/racoon2/Makefile
==============================================================================
--- head/security/racoon2/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/racoon2/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -11,7 +11,7 @@ RACOON2_COMMIT_DATE=20181215
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	Racoon2 IPsec daemon
 
-BROKEN_FreeBSD_11=	Requires openssl111 to build
+BROKEN_FreeBSD_11=	Requires openssl to build
 
 CONFLICTS=	racoon2-legacy-*
 

Modified: head/security/softhsm2/Makefile
==============================================================================
--- head/security/softhsm2/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/softhsm2/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -52,7 +52,7 @@ CRYP_OPEN_CONFIGURE_ON=	--with-crypto-backend=openssl 
 
 .include <bsd.port.options.mk>
 
-.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl111}
+.if ${SSL_DEFAULT:Mlibressl*} || ${SSL_DEFAULT:Mopenssl}
 CONFIGURE_ARGS+=	--disable-gost
 .endif
 

Modified: head/security/sslscan/Makefile
==============================================================================
--- head/security/sslscan/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/security/sslscan/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -31,8 +31,8 @@ UNSAFESSL_ALL_TARGET=	sslscan
 
 .include <bsd.port.pre.mk>
 
-.if empty(PORT_OPTIONS:MUNSAFESSL) && ${SSL_DEFAULT:Mopenssl111}
-BROKEN=		Does not build with openssl111
+.if empty(PORT_OPTIONS:MUNSAFESSL) && ${SSL_DEFAULT:Mopenssl}
+BROKEN=		Does not build with openssl
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/sysutils/cfengine310/Makefile
==============================================================================
--- head/sysutils/cfengine310/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/sysutils/cfengine310/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -76,8 +76,8 @@ LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085
 .if ${SSL_DEFAULT} != "openssl"
-BROKEN_FreeBSD_12=	fails to build with openssl111
-BROKEN_FreeBSD_13=	fails to build with openssl111
+BROKEN_FreeBSD_12=	fails to build with openssl
+BROKEN_FreeBSD_13=	fails to build with openssl
 .endif
 .endif
 

Modified: head/sysutils/cfengine311/Makefile
==============================================================================
--- head/sysutils/cfengine311/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/sysutils/cfengine311/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -76,8 +76,8 @@ LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1200085
 .if ${SSL_DEFAULT} != "openssl"
-BROKEN_FreeBSD_12=	fails to build with openssl111
-BROKEN_FreeBSD_13=	fails to build with openssl111
+BROKEN_FreeBSD_12=	fails to build with openssl
+BROKEN_FreeBSD_13=	fails to build with openssl
 .endif
 .endif
 

Modified: head/sysutils/ipmitool/Makefile
==============================================================================
--- head/sysutils/ipmitool/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/sysutils/ipmitool/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -49,7 +49,7 @@ FREEIPMI_CONFIGURE_ENABLE=	intf-free
 
 .include <bsd.port.options.mk>
 
-.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT} == openssl111
+.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085) || ${SSL_DEFAULT} == openssl
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src_plugins_lanplus_lanplus__crypt__impl.c
 .endif
 

Modified: head/textproc/libucl/Makefile
==============================================================================
--- head/textproc/libucl/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/textproc/libucl/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -54,7 +54,7 @@ UTILS_CONFIGURE_ENABLE=	utils
 .include <bsd.port.options.mk>
 
 # https://github.com/vstakhov/libucl/issues/203
-.if ${PORT_OPTIONS:MSIGNATURES} && ((${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl111)
+.if ${PORT_OPTIONS:MSIGNATURES} && ((${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl)
 BROKEN=	Signatures checking support does not build with OpenSSL 1.1.1
 .endif
 

Modified: head/www/envoy/Makefile
==============================================================================
--- head/www/envoy/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/www/envoy/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -13,7 +13,7 @@ COMMENT=	Edge and service proxy for cloud-native appli
 LICENSE=	APACHE20
 
 BROKEN_i386=	makes a lot of 64-bit assumptions (patches welcome)
-BROKEN_SSL=	base openssl openssl111 libressl libressl-devel
+BROKEN_SSL=	base openssl libressl libressl-devel
 BROKEN_SSL_REASON=	requires BoringSSL
 
 BUILD_DEPENDS=	${LOCALBASE}/include/absl/base/thread_annotations.h:devel/abseil \

Modified: head/www/squid3/Makefile
==============================================================================
--- head/www/squid3/Makefile	Wed Jan  1 17:27:54 2020	(r521748)
+++ head/www/squid3/Makefile	Wed Jan  1 17:30:19 2020	(r521749)
@@ -114,7 +114,7 @@ SSL_CONFIGURE_ON=		--with-openssl=${OPENSSLBASE} \
 				LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
 				LIBOPENSSL_LIBS="-lcrypto -lssl"
 SSL_USES=			ssl
-SSL_VARS=			BROKEN_SSL=openssl111
+SSL_VARS=			BROKEN_SSL=openssl
 SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
 SSL_CRTD_IMPLIES=		SSL
 STACKTRACES_CONFIGURE_ENABLE=	stacktraces
