Chase rename of security/openssl111

- Categories a-m MFH: 2020Q1
2020-01-01 17:27:54 +00:00
parent 3931e3bee8
commit 0467bf077e
28 changed files with 42 additions and 46 deletions
--- a/audio/cpp-xmms2/Makefile
+++ b/audio/cpp-xmms2/Makefile
@@ -16,7 +16,7 @@ USES=		gnome ssl
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 PLIST=		${.CURDIR}/pkg-plist

--- a/audio/p5-xmms2/Makefile
+++ b/audio/p5-xmms2/Makefile
@@ -14,7 +14,7 @@ MASTERDIR=	${.CURDIR}/../xmms2

 USES=		perl5 ssl

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 PLIST=		${.CURDIR}/pkg-plist

--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -17,7 +17,7 @@ MASTERDIR=	${.CURDIR}/../xmms2
 USES=		python:2.7 ssl
 USE_PYTHON=	flavors

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 PLIST=		${.CURDIR}/pkg-plist

--- a/databases/mongodb34-tools/Makefile
+++ b/databases/mongodb34-tools/Makefile
@@ -10,8 +10,8 @@ COMMENT=	Tools for MongoDB

 LICENSE=	APACHE20

-BROKEN_SSL=	openssl111 libressl libressl-devel
-BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
+BROKEN_SSL=	openssl libressl libressl-devel
+BROKEN_SSL_REASON_openssl=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
 BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}

--- a/databases/mongodb36-tools/Makefile
+++ b/databases/mongodb36-tools/Makefile
@@ -12,8 +12,8 @@ LICENSE=	APACHE20

 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
-BROKEN_SSL=	openssl111 libressl libressl-devel
-BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
+BROKEN_SSL=	openssl libressl libressl-devel
+BROKEN_SSL_REASON_openssl=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
 BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
 BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}

--- a/databases/mysql-connector-c/Makefile
+++ b/databases/mysql-connector-c/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MySQL database connector for C
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	variable has incomplete type 'EVP_CIPHER_CTX' (aka 'evp_cipher_ctx_st')

 USES=		cmake compiler:features mysql ssl
 CMAKE_ARGS+=	-DOPENSSL_INCLUDE_DIR="${OPENSSLINC}"
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -46,8 +46,8 @@ PLIST_SUB=	VERSION=${PORTVERSION}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE:STRING=Debug
 .endif

-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && !${SSL_DEFAULT:Mopenssl111}
-BROKEN=	nextcloudclient requires OpenSSL 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && !${SSL_DEFAULT:Mopenssl}
+BROKEN=	nextcloudclient requires OpenSSL 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf
 .endif

 post-patch:
--- a/devel/erlang-exmpp/Makefile
+++ b/devel/erlang-exmpp/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	erlang-
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Fast and scalable library for XMPP written in Erlang/OTP

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 LICENSE=	EPL

--- a/devel/hadoop/Makefile
+++ b/devel/hadoop/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Apache Map/Reduce framework

 LICENSE=	APACHE20

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'HMAC_CTX' (aka 'hmac_ctx_st')
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	variable has incomplete type 'HMAC_CTX' (aka 'hmac_ctx_st')

 BUILD_DEPENDS=	gmake:devel/gmake \
 		gsed:textproc/gsed
--- a/devel/hadoop2/Makefile
+++ b/devel/hadoop2/Makefile
@@ -24,8 +24,8 @@ COMMENT=	Apache Map/Reduce framework

 LICENSE=	APACHE20

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct evp_cipher_ctx_st'
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	incomplete definition of type 'struct evp_cipher_ctx_st'

 BUILD_DEPENDS=	${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3 \
 		cmake:devel/cmake \
--- a/devel/libopkele/Makefile
+++ b/devel/libopkele/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtidy.so:www/tidy-lib \
 		libxslt.so:textproc/libxslt

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'DH' (aka 'dh_st')
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	member access into incomplete type 'DH' (aka 'dh_st')

 USES=		gmake libtool localbase:ldflags pathfix \
 		pkgconfig ssl
--- a/devel/mongo-cxx-driver/Makefile
+++ b/devel/mongo-cxx-driver/Makefile
@@ -13,8 +13,8 @@ COMMENT=	MongoDB Legacy C++ Driver
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/APACHE-2.0.txt

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'BIO_s_file_internal'
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	use of undeclared identifier 'BIO_s_file_internal'

 LIB_DEPENDS=	libboost_system.so:devel/boost-libs

--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -84,7 +84,7 @@ EXPIRATION_DATE=	2020-01-10
 .if ${SSL_DEFAULT} == base
 BROKEN_FreeBSD_12=	fails to compile: incomplete definition of type 'struct bio_st'
 BROKEN_FreeBSD_13=	fails to compile: incomplete definition of type 'struct bio_st'
-.elif ${SSL_DEFAULT} == openssl111
+.elif ${SSL_DEFAULT} == openssl
 BROKEN=			fails to compile: incomplete definition of type 'struct bio_st'
 .endif

--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Robust high performance CORBA ORB for C++ and Python

 LICENSE=	GPLv2

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'DH' (aka 'dh_st')
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	member access into incomplete type 'DH' (aka 'dh_st')

 USES=		compiler:c++11-lang gmake pkgconfig python tar:bzip2 \
 		shebangfix ssl
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -44,7 +44,7 @@ DEBUG_DESC=	Install debug library

 .include <bsd.port.options.mk>

-.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl111
+.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx-openssl111
 .else
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \

 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	'configure: error: "Error: libcrypto required."'
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	'configure: error: "Error: libcrypto required."'

 USES=			autoreconf pkgconfig gmake compiler:c++11-lang \
 			libtool pathfix ssl
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -11,8 +11,8 @@ MASTER_SITES=	GNU/gnu-arch \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Original arch source control management CLI written in C

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	incomplete definition of type 'struct X509_name_entry_st'
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	incomplete definition of type 'struct X509_name_entry_st'

 BUILD_DEPENDS=	gpatch:devel/patch \
 		gdiff:textproc/diffutils \
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Very lightweight C++ design pattern library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	error: allocation of incomplete type 'EVP_CIPHER_CTX'
+BROKEN_SSL=	openssl
+BROKEN_SSL_REASON_openssl=	error: allocation of incomplete type 'EVP_CIPHER_CTX'

 USES=		compiler:c++11-lib cmake pathfix pkgconfig ssl
 CMAKE_ARGS=	-DBUILD_TESTING:BOOL=ON \
--- a/dns/credns/Makefile
+++ b/dns/credns/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Verifier performing validation in the DNS notify/transfer-chain
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 USE_RC_SUBR=	credns

--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -51,7 +51,7 @@ SETUID_VARS=		GROUPS=pdns \

 .include <bsd.port.pre.mk>

-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl111
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl
 CONFIGURE_ARGS+=	--enable-libdecaf \
 			--enable-libsodium
 LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -117,7 +117,7 @@ ZEROMQ_CONFIGURE_ON=	--enable-remotebackend-zeromq

 .include <bsd.port.pre.mk>

-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl111
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} != openssl
 CONFIGURE_ARGS+=	--with-libdecaf \
 			--with-libsodium
 LIB_DEPENDS+=		libdecaf.so:security/libdecaf \
--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@@ -12,7 +12,7 @@ COMMENT=	High performance DNS/DNSSEC zone validator

 LICENSE=	BSD2CLAUSE

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 LIB_DEPENDS=	libJudy.so:devel/judy

--- a/irc/bip/Makefile
+++ b/irc/bip/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple IRC proxy with SSL support
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
--- a/lang/erlang-runtime20/Makefile
+++ b/lang/erlang-runtime20/Makefile
@@ -53,7 +53,7 @@ OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE

-OPENSSL_VARS=	BROKEN_SSL=openssl111
+OPENSSL_VARS=	BROKEN_SSL=openssl

 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -17,10 +17,10 @@ BROKEN_mips64=		does not build: clang: Command not found
 # XXX MCL 20181112
 #BROKEN_powerpc64=	does not build: clang: Command not found
 BROKEN_sparc64=		does not compile: assertion failed
-BROKEN_SSL=				libressl libressl-devel openssl111
+BROKEN_SSL=				libressl libressl-devel openssl
 BROKEN_SSL_REASON_libressl=		Needs an old version of OpenSSL (older than 1.1)
 BROKEN_SSL_REASON_libressl-devel=	Needs an old version of OpenSSL (older than 1.1)
-BROKEN_SSL_REASON_openssl111=		Needs an older version of OpenSSL (older than 1.1)
+BROKEN_SSL_REASON_openssl=		Needs an older version of OpenSSL (older than 1.1)

 LIB_DEPENDS=	libslang.so:devel/libslang2\
 		libpcre.so:devel/pcre
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library for posting electronic mail
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 USES=		gmake libtool tar:bzip2
 GNU_CONFIGURE=	yes
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -15,9 +15,6 @@ COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BROKEN_SSL=	openssl
-BROKEN_SSL_REASON_openssl=		Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl111|libressl*] to /etc/make.conf
-
 LIB_DEPENDS=	libevent.so:devel/libevent

 OPTIONS_DEFINE=	CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB
@@ -60,9 +57,8 @@ CONFIGURE_ARGS+=	--with-libasr=${LOCALBASE} \
 .include <bsd.port.pre.mk>

 .if ${OPSYS} == FreeBSD && \
-    ((${OSVERSION} < 1200084 && ${SSL_DEFAULT} == "base") || \
-    (${SSL_DEFAULT} == "openssl"))
-BROKEN=		Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl111|libressl*] to /etc/make.conf
+    (${OSVERSION} < 1200084 && ${SSL_DEFAULT} == "base")
+BROKEN=		Openssl 1.0 API is EoL, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl|libressl*] to /etc/make.conf
 .endif

 post-install-TABLE_DB-on:
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Traps spammers with a very slow smtp-login and return 4xx error

 LICENSE=	BSD2CLAUSE

-BROKEN_SSL=	openssl111
+BROKEN_SSL=	openssl

 USE_RC_SUBR?=	obspamd obspamlogd
 USES=		ssl