Attachment 221704 Details for Bug 252802 – v1

[patch] v1

bug252802.diff (text/plain), 2.20 KB, created by Jan Beich on 2021-01-18 12:29:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-01-18 12:29:43 UTC

Size: 2.20 KB

patch

obsolete

>From f9d9af891b8797bd442cf75f9ddcf485d181deb7 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 18 Jan 2021 12:20:50 +0000
>Subject: [PATCH] net/openntpd: switch to libretls on FreeBSD 12+
>
>Expose libtls dependency as TLS option. When using LibreSSL use its
>own libtls but when using OpenSSL use libtls from libretls.
>
>PR:		252802
>Approved by:	naddy
>Reviewed by:	bapt
>---
> net/openntpd/Makefile | 27 ++++++++++++++++-----------
> 1 file changed, 16 insertions(+), 11 deletions(-)
>
>diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
>index 705053be7cda..3b1c6ac9ba18 100644
>--- a/net/openntpd/Makefile
>+++ b/net/openntpd/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	openntpd
> PORTVERSION=	6.8p1
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	2
> CATEGORIES=	net
> MASTER_SITES=	OPENBSD/OpenNTPD
>@@ -12,10 +12,6 @@ COMMENT=	Network Time Protocol (NTP) daemon
> 
> LICENSE=	ISCL
> 
>-RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
>-
>-USES=		ssl
>-
> CONFLICTS=	ntp ntp-devel ntpsec
> 
> USE_RC_SUBR=	openntpd
>@@ -23,11 +19,22 @@ USERS=		_ntp
> GROUPS=		_ntp
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-cacert=${LOCALBASE}/etc/ssl/cert.pem
> 
> SUB_FILES=	480.status-openntpd pkg-message
> SUB_LIST=	MANPREFIX="${MANPREFIX}"
> 
>+OPTIONS_DEFINE=	TLS
>+OPTIONS_DEFAULT=TLS
>+
>+TLS_DESC=		HTTPS Constraint Functionality
>+.if ! ${DEFAULT_VERSIONS:U:Mssl=libressl*}
>+TLS_LIB_DEPENDS=	libtls.so:security/libretls
>+.endif
>+TLS_RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
>+TLS_USES=		localbase ssl
>+TLS_CONFIGURE_ENABLE=	https-constraint
>+TLS_CONFIGURE_ON=	--with-cacert=${LOCALBASE}/etc/ssl/cert.pem
>+
> pre-build:
> 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
> 	    ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8
>@@ -40,12 +47,10 @@ post-install:
> 
> .include <bsd.port.pre.mk>
> 
>-# Requires libtls from LibreSSL
>-.if ${SSL_DEFAULT:Mlibressl*}
>-CPPFLAGS+=		-I${OPENSSLINC}
>-LDFLAGS+=		-L${OPENSSLLIB}
>-.else # SSL_DEFAULT
>+# Drop after FreeBSD 11 EOL: requires libtls from LibreSSL
>+.if ${PORT_OPTIONS:MTLS} && ${SSL_DEFAULT:Mbase} && exists(/usr/include/openssl/ssl23.h)
> BUILD_DEPENDS+=		${NONEXISTENT}:security/libressl:stage
>+LIB_DEPENDS:=		${LIB_DEPENDS:N*libretls}
> CPPFLAGS+=		-I${WRKDIR}/libressl/include
> LDFLAGS+=		-L${WRKDIR}/libressl/lib
>

Actions: View | Diff

Attachments on bug 252802: 221704