Date: Mon, 18 Jan 2021 20:02:16 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561963 - head/net/openntpd Message-ID: <202101182002.10IK2G0O068219@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Mon Jan 18 20:02:16 2021 New Revision: 561963 URL: https://svnweb.freebsd.org/changeset/ports/561963 Log: net/openntpd: switch to libretls on FreeBSD 12+ When using LibreSSL use its own libtls but when using OpenSSL use libtls from libretls. Reworked from PR: 252802 Submitted by: jbeich Modified: head/net/openntpd/Makefile Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Mon Jan 18 19:40:32 2021 (r561962) +++ head/net/openntpd/Makefile Mon Jan 18 20:02:16 2021 (r561963) @@ -2,7 +2,7 @@ PORTNAME= openntpd PORTVERSION= 6.8p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD @@ -14,7 +14,7 @@ LICENSE= ISCL RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss -USES= ssl +USES= localbase ssl CONFLICTS= ntp ntp-devel ntpsec @@ -40,11 +40,13 @@ post-install: .include <bsd.port.pre.mk> -# Requires libtls from LibreSSL +# When using LibreSSL use its own libtls, but when using OpenSSL +# use libtls from libretls. .if ${SSL_DEFAULT:Mlibressl*} -CPPFLAGS+= -I${OPENSSLINC} -LDFLAGS+= -L${OPENSSLLIB} -.else # SSL_DEFAULT +# /* empty */ + +# Drop after FreeBSD 11 EOL: requires libtls from LibreSSL +.elif ${SSL_DEFAULT:Mbase} && exists(/usr/include/openssl/ssl23.h) BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage CPPFLAGS+= -I${WRKDIR}/libressl/include LDFLAGS+= -L${WRKDIR}/libressl/lib @@ -54,6 +56,9 @@ LDFLAGS+= -L${WRKDIR}/libressl/lib pre-configure: @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \ && ${FIND} . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1 + +.else +LIB_DEPENDS+= libtls.so:security/libretls .endif # SSL_DEFAULT .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101182002.10IK2G0O068219>