Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Oct 2024 13:20:34 GMT
From:      Rodrigo Osorio <rodrigo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d258c3602afd - main - dns/unbound: update to 1.22.0
Message-ID:  <202410181320.49IDKYg5057457@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo:

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

commit d258c3602afd47841b285e0ac11de3bf09181d05
Author:     Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2024-10-18 13:08:53 +0000
Commit:     Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2024-10-18 13:18:00 +0000

    dns/unbound: update to 1.22.0
    
    Changelog: https://nlnetlabs.nl/news/2024/Oct/17/unbound-1.22.0-released/
    Full changelog: https://nlnetlabs.nl/projects/unbound/download/#unbound-1-22-0
    
    PR:             282172
    Reported by:    Jaap Akkerhuis <jaap@NLnetLabs.nl> (maintainer)
---
 dns/unbound/Makefile                                         | 12 +++++-------
 dns/unbound/distinfo                                         |  6 +++---
 dns/unbound/files/patch-smallapp_unbound-control-setup.sh.in | 11 -----------
 dns/unbound/pkg-plist                                        |  2 +-
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index a32644d46e9e..56030abd2448 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	unbound
-DISTVERSION=	1.21.1
+DISTVERSION=	1.22.0
 CATEGORIES=	dns
 MASTER_SITES=	https://www.nlnetlabs.nl/downloads/unbound/
 
@@ -10,7 +10,8 @@ WWW=		https://www.nlnetlabs.nl/projects/unbound
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libexpat.so:textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+		libnghttp2.so:www/libnghttp2
 
 USES=		autoreconf cpe libtool pkgconfig ssl
 CPE_VENDOR=	nlnetlabs
@@ -31,16 +32,15 @@ PORTDOCS=	CNAME-basedRedirectionDesignNotes.pdf CREDITS Changelog \
 		control_proto_spec.txt example.conf ietf67-design-02.odp \
 		ietf67-design-02.pdf requirements.txt
 
-OPTIONS_DEFINE=		DEP-RSA1024 DNSCRYPT DNSTAP DOCS DOH DYNLIB ECDSA EVAPI \
+OPTIONS_DEFINE=		DEP-RSA1024 DNSCRYPT DNSTAP DOCS DYNLIB ECDSA EVAPI \
 			FILTER_AAAA GOST HIREDIS LIBEVENT MUNIN_PLUGIN PYTHON \
 			SUBNET TFOCL TFOSE THREADS
-OPTIONS_DEFAULT=	DNSCRYPT DOH DYNLIB ECDSA GOST LIBEVENT THREADS
+OPTIONS_DEFAULT=	DNSCRYPT DYNLIB ECDSA GOST LIBEVENT THREADS
 OPTIONS_SUB=		yes
 
 DEP-RSA1024_DESC=	Deprecate the use of RSA 1024 keys
 DNSCRYPT_DESC=		Enable dnscrypt support
 DNSTAP_DESC=		Enable dnstap logging support
-DOH_DESC=		Enable DNS-over-HTTPS support
 DYNLIB_DESC=		Enable support for dynamic (shared) 3rd-party libraries
 ECDSA_DESC=		Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
 EVAPI_DESC=		(Experimental) pluggable event based libunbound API support
@@ -62,8 +62,6 @@ DNSCRYPT_CONFIGURE_ENABLE=	dnscrypt
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm \
 				libprotobuf-c.so:devel/protobuf-c
 DNSTAP_CONFIGURE_ENABLE=	dnstap
-DOH_LIB_DEPENDS=		libnghttp2.so:www/libnghttp2
-DOH_CONFIGURE_ON=		--with-libnghttp2
 DYNLIB_CONFIGURE_ON=		--with-dynlibmodule
 ECDSA_CONFIGURE_ENABLE=		ecdsa
 ECDSA_VARS=			DEPENDS_ARGS+=WITH_ECDSA=yes
diff --git a/dns/unbound/distinfo b/dns/unbound/distinfo
index 65f62dbab05b..b4703197caee 100644
--- a/dns/unbound/distinfo
+++ b/dns/unbound/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1727979122
-SHA256 (unbound-1.21.1.tar.gz) = 3036d23c23622b36d3c87e943117bdec1ac8f819636eb978d806416b0fa9ea46
-SIZE (unbound-1.21.1.tar.gz) = 6568258
+TIMESTAMP = 1729156458
+SHA256 (unbound-1.22.0.tar.gz) = c5dd1bdef5d5685b2cedb749158dd152c52d44f65529a34ac15cd88d4b1b3d43
+SIZE (unbound-1.22.0.tar.gz) = 6682466
diff --git a/dns/unbound/files/patch-smallapp_unbound-control-setup.sh.in b/dns/unbound/files/patch-smallapp_unbound-control-setup.sh.in
deleted file mode 100644
index f366b8adc040..000000000000
--- a/dns/unbound/files/patch-smallapp_unbound-control-setup.sh.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- smallapp/unbound-control-setup.sh.in.orig	2024-10-03 12:44:59 UTC
-+++ smallapp/unbound-control-setup.sh.in
-@@ -104,7 +104,7 @@ while getopts 'd:hr' arg; do
- done
- shift $((OPTIND - 1))
- 
--if ! openssl >/dev/null 2>&1; then
-+if ! openssl version >/dev/null 2>&1; then
-     echo "$0 requires openssl to be installed for keys/certificates generation." >&2
-     exit 1
- fi
diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist
index 6f1767b0ea55..a9c16cace0bd 100644
--- a/dns/unbound/pkg-plist
+++ b/dns/unbound/pkg-plist
@@ -5,7 +5,7 @@ libdata/pkgconfig/libunbound.pc
 lib/libunbound.a
 lib/libunbound.so
 lib/libunbound.so.8
-lib/libunbound.so.8.1.29
+lib/libunbound.so.8.1.30
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410181320.49IDKYg5057457>