git: f1403234875e - main - dns/ldns: Update to 1.8.1

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f1403234875e034eacdc57143912602b273a93cb

commit f1403234875e034eacdc57143912602b273a93cb
Author:     Jaap Akkerhuis <jaap@NLnetLabs.nl>
AuthorDate: 2021-12-18 17:28:26 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2021-12-18 17:28:26 +0000

    dns/ldns: Update to 1.8.1
    
    https://www.nlnetlabs.nl/news/2021/Dec/03/ldns-1.8.1-released/
    
    PR:             260345
---
 dns/ldns/Makefile                             | 11 ++++++-----
 dns/ldns/distinfo                             |  6 +++---
 dns/ldns/files/patch-packaging_ldns-config.in | 18 ++++++++----------
 dns/ldns/pkg-plist                            |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 375bb1f8167c..d3cf1e2fa532 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -1,8 +1,7 @@
 # Created by: Konstantin Saurbier <saurbier@math.uni-bielefeld.de>
 
 PORTNAME=	ldns
-PORTVERSION=	1.7.1
-PORTREVISION=	2
+DISTVERSION=	1.8.1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.nlnetlabs.nl/downloads/ldns/ \
 		LOCAL/ehaupt
@@ -35,7 +34,7 @@ DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 HTMLDOCS=		doc/html/*
 
 OPTIONS_DEFINE+=	DANETAUSAGE GOST RRTYPEAMTRELAY RRTYPEAVC RRTYPENINFO \
-			RRTYPERKEY RRTYPETA
+			RRTYPERKEY RRTYPETA RRTYPESVCBHTTPS
 
 DANETAUSAGE_DESC=	Enable ta usage, requires openssl >= 1.1.0
 GOST_DESC=		GOST signatures enabled, requires openssl >= 1.0.0
@@ -44,6 +43,7 @@ RRTYPERKEY_DESC=	Enable draft RR type rkey.
 RRTYPETA_DESC=		Enable draft RR type ta.
 RRTYPEAVC_DESC=		Enable draft RR type avc.
 RRTYPEAMTRELAY_DESC=	Enable draft RR type amtrelay.
+RRTYPESVCBHTTPS_DESC= 	Enable SVCB and HTTPS draft RR types.
 
 OPTIONS_SUB=	yes
 
@@ -55,13 +55,14 @@ RRTYPERKEY_CONFIGURE_ENABLE=		rrtype-rkey
 RRTYPETA_CONFIGURE_ENABLE=		rrtype-ta
 RRTYPEAVC_CONFIGURE_ENABLE=		rrtype-avc
 RRTYPEAMTRELAY_CONFIGURE_ENABLE=	rrtype-amtrelay
+RRTYPESVCBHTTPS_CONFIGURE_ENABLE=	rrtype-svcb-https
 EXAMPLES_CONFIGURE_WITH=		examples
 DRILL_CONFIGURE_WITH=			drill
 DRILL_INSTALL_TARGET=			install-drill
 EXAMPLES_INSTALL_TARGET=		install-examples
 
 .if defined(BUILD_PYLDNS)
-USES+=		python:3.6-3.9
+USES+=		python:3.6+
 USE_PYTHON=	flavors
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 ALL_TARGET=	pyldns
@@ -91,7 +92,7 @@ BUILD_DEPENDS=		${RUN_DEPENDS}
 LIB_DEPENDS+=		libldns.so:dns/ldns
 
 post-patch:
-	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
+	${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DNS/LDNS/LDNS.so
diff --git a/dns/ldns/distinfo b/dns/ldns/distinfo
index 670a64e60cb5..de9c486ad6ce 100644
--- a/dns/ldns/distinfo
+++ b/dns/ldns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565861297
-SHA256 (ldns-1.7.1.tar.gz) = 8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
-SIZE (ldns-1.7.1.tar.gz) = 1244394
+TIMESTAMP = 1638532111
+SHA256 (ldns-1.8.1.tar.gz) = 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3
+SIZE (ldns-1.8.1.tar.gz) = 1284971
diff --git a/dns/ldns/files/patch-packaging_ldns-config.in b/dns/ldns/files/patch-packaging_ldns-config.in
index b8dacd192e20..583241466a83 100644
--- a/dns/ldns/files/patch-packaging_ldns-config.in
+++ b/dns/ldns/files/patch-packaging_ldns-config.in
@@ -1,13 +1,11 @@
---- packaging/ldns-config.in.orig	2019-09-03 13:07:40 UTC
+--- packaging/ldns-config.in.orig	2021-11-16 13:49:37 UTC
 +++ packaging/ldns-config.in
-@@ -1,6 +1,10 @@
- #!/bin/sh
- 
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
+@@ -4,7 +4,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
  VERSION="@PACKAGE_VERSION@"
-+CFLAGS="@CFLAGS@"
+ CFLAGS="@CFLAGS@"
+-CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@"
 +CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
- LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
- LIBS="@LIBS@ @LIBSSL_LIBS@"
- LIBDIR="@libdir@"
+ LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@"
+ PYTHON_CPPFLAGS="@PYTHON_CPPFLAGS@"
+ PYTHON_LDFLAGS="@PYTHON_LDFLAGS@"
diff --git a/dns/ldns/pkg-plist b/dns/ldns/pkg-plist
index 5e7fee01bb3d..a9b0a4bf0c47 100644
--- a/dns/ldns/pkg-plist
+++ b/dns/ldns/pkg-plist
@@ -60,7 +60,7 @@ include/ldns/zone.h
 lib/libldns.a
 lib/libldns.so
 lib/libldns.so.3
-lib/libldns.so.3.0.0
+lib/libldns.so.3.2.0
 libdata/pkgconfig/libldns.pc
 %%DRILL%%man/man1/drill.1.gz
 %%EXAMPLES%%man/man1/ldns-chaos.1.gz