From owner-svn-ports-head@freebsd.org Mon Jan 18 20:02:16 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ACCBF4F4C0E; Mon, 18 Jan 2021 20:02:16 +0000 (UTC) (envelope-from naddy@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 4DKN3r4TQ7z4vTc; Mon, 18 Jan 2021 20:02:16 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C48F1996C; Mon, 18 Jan 2021 20:02:16 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10IK2G0S068220; Mon, 18 Jan 2021 20:02:16 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10IK2G0O068219; Mon, 18 Jan 2021 20:02:16 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <202101182002.10IK2G0O068219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Mon, 18 Jan 2021 20:02:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561963 - head/net/openntpd X-SVN-Group: ports-head X-SVN-Commit-Author: naddy X-SVN-Commit-Paths: head/net/openntpd X-SVN-Commit-Revision: 561963 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2021 20:02:16 -0000 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 -# 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