dnsdist: Upgrade to version 2.0.2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: dnsdist: Upgrade to version 2.0.2
From: Marcin Gondek (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 2 Dec 2025 20:44:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Marcin Gondek <drixter%e-utp.net@localhost>
Pushed By:	drixter
Date:		Tue Dec 2 21:41:40 2025 +0100
Changeset:	a0784cc887245cc85ab7c8ad34dd3b284e8f8807

Added Files:
	dnsdist/DESCR
	dnsdist/Makefile
	dnsdist/PLIST
	dnsdist/distinfo
	dnsdist/files/dnsdist.sh
	dnsdist/files/smf/manifest.xml
	dnsdist/patches/patch-configure
	dnsdist/patches/patch-protobuf

Log Message:
dnsdist: Upgrade to version 2.0.2

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a0784cc887245cc85ab7c8ad34dd3b284e8f8807

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dnsdist/DESCR                   |  4 +++
 dnsdist/Makefile                | 76 +++++++++++++++++++++++++++++++++++++++++
 dnsdist/PLIST                   |  4 +++
 dnsdist/distinfo                |  7 ++++
 dnsdist/files/dnsdist.sh        | 24 +++++++++++++
 dnsdist/files/smf/manifest.xml  | 28 +++++++++++++++
 dnsdist/patches/patch-configure | 15 ++++++++
 dnsdist/patches/patch-protobuf  | 10 ++++++
 8 files changed, 168 insertions(+)

diffs:
diff --git a/dnsdist/DESCR b/dnsdist/DESCR
new file mode 100644
index 0000000000..8b6e998da8
--- /dev/null
+++ b/dnsdist/DESCR
@@ -0,0 +1,4 @@
+dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its
+goal in life is to route traffic to the best server, delivering top
+performance to legitimate users while shunting or blocking abusive
+traffic.
diff --git a/dnsdist/Makefile b/dnsdist/Makefile
new file mode 100644
index 0000000000..3a750ee86b
--- /dev/null
+++ b/dnsdist/Makefile
@@ -0,0 +1,76 @@
+# $NetBSD: Makefile,v 1.42 2025/11/01 16:15:59 wiz Exp $
+
+DISTNAME=	dnsdist-2.0.2
+PKGREVISION=	0
+CATEGORIES=	net
+MASTER_SITES=	https://downloads.powerdns.com/releases/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	drixter%e-utp.net@localhost
+HOMEPAGE=	https://dnsdist.org/
+COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer
+LICENSE=	gnu-gpl-v2
+
+TOOL_DEPENDS+=		${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+
+USE_LANGUAGES=		c c++
+USE_CXX_FEATURES=	c++11
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=			DNSDIST_USER DNSDIST_GROUP
+DNSDIST_USER?=			dnsdist
+DNSDIST_GROUP?=			dnsdist
+PKG_GROUPS+=			${DNSDIST_GROUP}
+PKG_USERS+=			${DNSDIST_USER}:${DNSDIST_GROUP}
+PKG_GECOS.${DNSDIST_USER}=	dnsdist daemon user
+
+CHECK_WRKREF_SKIP+=		bin/dnsdist
+
+FILES_SUBST+=	DNSDIST_USER=${DNSDIST_USER}
+FILES_SUBST+=	DNSDIST_GROUP=${DNSDIST_GROUP}
+
+CONFIGURE_ARGS+=	--enable-dns-over-tls
+CONFIGURE_ARGS+=	--enable-dnscrypt
+CONFIGURE_ARGS+=	--enable-dnstap
+CONFIGURE_ARGS+=	--with-libsodium
+CONFIGURE_ARGS+=	--with-libssl
+CONFIGURE_ARGS+=	--with-lua
+CONFIGURE_ARGS+=	--with-nghttp2
+CONFIGURE_ARGS+=	--with-re2
+CONFIGURE_ARGS+=	--without-net-snmp
+CONFIGURE_ARGS+=	--enable-dns-over-https
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-headers}
+
+.include "../../mk/readline.buildlink3.mk"
+
+.if ${READLINE_TYPE} == "editline"
+CONFIGURE_ARGS+=	--with-libedit
+CONFIGURE_ENV+=		LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.editlinereadline}/include"
+CONFIGURE_ENV+=		LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.editlinereadline}/lib ${BUILDLINK_LDADD.editlinereadline}"
+.else
+CONFIGURE_ARGS+=	--without-libedit
+.endif
+
+EGDIR=			${PREFIX}/share/examples/dnsdist
+CONF_FILES=		${EGDIR}/dnsdist.conf-dist ${PKG_SYSCONFDIR}/dnsdist.conf
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+RCD_SCRIPTS+=		dnsdist
+
+.include "../../databases/lmdb/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/re2/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../net/fstrm/buildlink3.mk"
+.include "../../security/libsodium/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../www/nghttp2/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
+.include "../../mk/atomic64.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/dnsdist/PLIST b/dnsdist/PLIST
new file mode 100644
index 0000000000..f84e457785
--- /dev/null
+++ b/dnsdist/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.3 2025/08/12 07:22:24 wiz Exp $
+bin/dnsdist
+man/man1/dnsdist.1
+share/examples/dnsdist/dnsdist.conf-dist
diff --git a/dnsdist/distinfo b/dnsdist/distinfo
new file mode 100644
index 0000000000..0c5de06d38
--- /dev/null
+++ b/dnsdist/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.22 2025/10/31 15:54:55 jperkin Exp $
+
+BLAKE2s (dnsdist-2.0.2.tar.xz) = f7a18e3afe863255aaaf040ca6c8f573365ea415f4483062c5c6d71d0211b4c1
+SHA512 (dnsdist-2.0.2.tar.xz) = 7f53d13bb90b7b70da364341e50473b88be0bc9619e3263e352bed75aa57edbc018824439749956281a2c7a5d32c653e7378fe9d3cbc296042fa8120eee75fae
+Size (dnsdist-2.0.2.tar.xz) = 2284864 bytes
+SHA1 (patch-configure) = d9ec9f3416862f471a3029168681b9512ced68b9
+SHA1 (patch-protobuf) = 51da6896c3bb312072ca01362b403e073498a01e
diff --git a/dnsdist/files/dnsdist.sh b/dnsdist/files/dnsdist.sh
new file mode 100644
index 0000000000..c4b5d56543
--- /dev/null
+++ b/dnsdist/files/dnsdist.sh
@@ -0,0 +1,24 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dnsdist.sh,v 1.2 2022/10/24 11:08:15 jperkin Exp $
+#
+# PROVIDE: dnsdist 
+# REQUIRE: DAEMON network
+# KEYWORD: shutdown
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="dnsdist"
+rcvar=$name
+command="@PREFIX@/bin/dnsdist"
+dnsdist_flags="${dnsdist_flags:- -u @DNSDIST_USER@ -g @DNSDIST_GROUP@ -C @PKG_SYSCONFDIR@/dnsdist.conf}"
+
+if [ -f /etc/rc.subr ]; then
+        load_rc_config $name
+	run_rc_command "$1"
+else
+	echo -n "${name}"
+	${command} ${dnsdist_flags}
+fi
diff --git a/dnsdist/files/smf/manifest.xml b/dnsdist/files/smf/manifest.xml
new file mode 100644
index 0000000000..739af89727
--- /dev/null
+++ b/dnsdist/files/smf/manifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default" />
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local" />
+    </dependency>
+    <exec_method type="method" name="start" exec="@PREFIX@/bin/dnsdist --supervised -u @DNSDIST_USER@ -g @DNSDIST_GROUP@ -C %{config_file} &amp;" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/dnsdist.conf" />
+    </property_group>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">dnsdist daemon</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
diff --git a/dnsdist/patches/patch-configure b/dnsdist/patches/patch-configure
new file mode 100644
index 0000000000..7d38911532
--- /dev/null
+++ b/dnsdist/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.5 2025/10/31 15:54:55 jperkin Exp $
+
+Fix --without-libedit, required when using readline.
+
+--- configure.orig	2025-10-31 15:48:25.770875216 +0000
++++ configure
+@@ -18916,7 +18916,7 @@ printf %s "checking whether to link in l
+ # Check whether --with-libedit was given.
+ if test ${with_libedit+y}
+ then :
+-  withval=$with_libedit; with_libedit=$enableval
++  withval=$with_libedit; with_libedit=$withval
+ else case e in #(
+   e) with_libedit=yes
+    ;;
diff --git a/dnsdist/patches/patch-protobuf b/dnsdist/patches/patch-protobuf
new file mode 100644
index 0000000000..7098b4ba0c
--- /dev/null
+++ b/dnsdist/patches/patch-protobuf
@@ -0,0 +1,10 @@
+--- dnsdist-protobuf.cc
++++ dnsdist-protobuf.cc
+@@ -25,6 +25,7 @@
+ #include "base64.hh"
+ #include "dnsdist.hh"
+ #include "dnsdist-protobuf.hh"
++#include "dolog.hh"
+ #include "protozero.hh"
+ 
+ DNSDistProtoBufMessage::DNSDistProtoBufMessage(const DNSQuestion& dnsquestion) :
Prev by Date: adguardhome: removed; import to base
Next by Date: guile30: add upgrade candidate to 3.0.11, from gdt
Previous by Thread: adguardhome: removed; import to base
Next by Thread: guile30: add upgrade candidate to 3.0.11, from gdt
Indexes:
Home | Main Index | Thread Index | Old Index