Tue Aug 22 20:31:36 2023 UTC ()
dnsdist: updated to 1.8.0

1.8.0

Bug Fixes

Fix ���Unknown key��� issue for actions and rules parameters
Fix a dnsheader unaligned case
secpoll: explicitly include necessary ctime header for time_t


(adam)
diff -r1.20 -r1.21 pkgsrc/net/dnsdist/Makefile
diff -r1.13 -r1.14 pkgsrc/net/dnsdist/distinfo
diff -r1.1 -r0 pkgsrc/net/dnsdist/files/dnsdist.conf
diff -r1.5 -r1.6 pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc
diff -r1.6 -r1.7 pkgsrc/net/dnsdist/patches/patch-dnsdist.cc
diff -r1.2 -r1.3 pkgsrc/net/dnsdist/patches/patch-qtype.hh
Wed Aug 23 05:31:36 2023
Mon Jun 26 19:39:29 2023
pkgsrc/net/dnsdist/files/dnsdist.conf,v
anoncvs not yet been updated
cvs diff -r1.20 -r1.21 pkgsrc/net/dnsdist/Makefile (expand / switch to unified diff)

--- pkgsrc/net/dnsdist/Makefile 2023/06/06 10:51:59 1.20
+++ pkgsrc/net/dnsdist/Makefile 2023/08/22 20:31:36 1.21
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.20 2023/06/06 10:51:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2023/08/22 20:31:36 adam Exp $
2 2
3DISTNAME= dnsdist-1.7.2 3DISTNAME= dnsdist-1.8.0
4PKGREVISION= 2 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= https://downloads.powerdns.com/releases/ 5MASTER_SITES= https://downloads.powerdns.com/releases/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://dnsdist.org/ 9HOMEPAGE= https://dnsdist.org/
11COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer 10COMMENT= Highly DNS-, DoS- and abuse-aware loadbalancer
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14GNU_CONFIGURE= yes 
15USE_LANGUAGES= c c++11 13USE_LANGUAGES= c c++11
16USE_TOOLS+= gmake pkg-config 14USE_TOOLS+= gmake pkg-config
 15GNU_CONFIGURE= yes
17 16
18.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
19 18
20BUILD_DEFS+= DNSDIST_USER DNSDIST_GROUP 19BUILD_DEFS+= DNSDIST_USER DNSDIST_GROUP
21DNSDIST_USER?= dnsdist 20DNSDIST_USER?= dnsdist
22DNSDIST_GROUP?= dnsdist 21DNSDIST_GROUP?= dnsdist
23PKG_GROUPS+= ${DNSDIST_GROUP} 22PKG_GROUPS+= ${DNSDIST_GROUP}
24PKG_USERS+= ${DNSDIST_USER}:${DNSDIST_GROUP} 23PKG_USERS+= ${DNSDIST_USER}:${DNSDIST_GROUP}
25PKG_GECOS.${DNSDIST_USER}= dnsdist daemon user 24PKG_GECOS.${DNSDIST_USER}= dnsdist daemon user
26 25
27FILES_SUBST+= DNSDIST_USER=${DNSDIST_USER} 26FILES_SUBST+= DNSDIST_USER=${DNSDIST_USER}
28FILES_SUBST+= DNSDIST_GROUP=${DNSDIST_GROUP} 27FILES_SUBST+= DNSDIST_GROUP=${DNSDIST_GROUP}
29CONF_FILES+= share/examples/dnsdist/dnsdist.conf \ 28CONF_FILES+= share/examples/dnsdist/dnsdist.conf \
@@ -32,30 +31,29 @@ CONF_FILES+= share/examples/dnsdist/dnsd @@ -32,30 +31,29 @@ CONF_FILES+= share/examples/dnsdist/dnsd
32CONFIGURE_ARGS+= --enable-dns-over-tls 31CONFIGURE_ARGS+= --enable-dns-over-tls
33CONFIGURE_ARGS+= --enable-dnscrypt 32CONFIGURE_ARGS+= --enable-dnscrypt
34CONFIGURE_ARGS+= --enable-dnstap 33CONFIGURE_ARGS+= --enable-dnstap
35CONFIGURE_ARGS+= --with-libsodium 34CONFIGURE_ARGS+= --with-libsodium
36CONFIGURE_ARGS+= --with-libssl 35CONFIGURE_ARGS+= --with-libssl
37CONFIGURE_ARGS+= --with-lua 36CONFIGURE_ARGS+= --with-lua
38CONFIGURE_ARGS+= --with-nghttp2 37CONFIGURE_ARGS+= --with-nghttp2
39CONFIGURE_ARGS+= --with-re2 38CONFIGURE_ARGS+= --with-re2
40CONFIGURE_ARGS+= --without-net-snmp 39CONFIGURE_ARGS+= --without-net-snmp
41 40
42CONFIGURE_ENV+= LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.editlinereadline}/include" 41CONFIGURE_ENV+= LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.editlinereadline}/include"
43CONFIGURE_ENV+= LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.editlinereadline}/lib ${BUILDLINK_LDADD.editlinereadline}" 42CONFIGURE_ENV+= LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.editlinereadline}/lib ${BUILDLINK_LDADD.editlinereadline}"
44 43
45INSTALLATION_DIRS+= share/examples/dnsdist 
46RCD_SCRIPTS+= dnsdist 44RCD_SCRIPTS+= dnsdist
47 45
48post-install: 46post-install:
49 ${INSTALL_DATA} ${.CURDIR}/files/dnsdist.conf \ 47 cd ${DESTDIR}${PREFIX} && \
50 ${DESTDIR}${PREFIX}/share/examples/dnsdist 48 ${MV} share/examples/dnsdist/dnsdist.conf-dist share/examples/dnsdist/dnsdist.conf || ${TRUE}
51 49
52.include "../../devel/boost-headers/buildlink3.mk" 50.include "../../devel/boost-headers/buildlink3.mk"
53.include "../../devel/re2/buildlink3.mk" 51.include "../../devel/re2/buildlink3.mk"
54.include "../../lang/lua/buildlink3.mk" 52.include "../../lang/lua/buildlink3.mk"
55.include "../../mk/atomic64.mk" 
56.include "../../mk/readline.buildlink3.mk" 
57.include "../../net/fstrm/buildlink3.mk" 53.include "../../net/fstrm/buildlink3.mk"
58.include "../../security/libsodium/buildlink3.mk" 54.include "../../security/libsodium/buildlink3.mk"
59.include "../../security/openssl/buildlink3.mk" 55.include "../../security/openssl/buildlink3.mk"
60.include "../../www/nghttp2/buildlink3.mk" 56.include "../../www/nghttp2/buildlink3.mk"
 57.include "../../mk/atomic64.mk"
 58.include "../../mk/readline.buildlink3.mk"
61.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/net/dnsdist/distinfo (expand / switch to unified diff)

--- pkgsrc/net/dnsdist/distinfo 2022/10/24 11:08:14 1.13
+++ pkgsrc/net/dnsdist/distinfo 2023/08/22 20:31:36 1.14
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1$NetBSD: distinfo,v 1.13 2022/10/24 11:08:14 jperkin Exp $ 1$NetBSD: distinfo,v 1.14 2023/08/22 20:31:36 adam Exp $
2 2
3BLAKE2s (dnsdist-1.7.2.tar.bz2) = 0daadb638e58c3142ed9cfe160b2f879fed1dd033aa3e4640e154c3002141fb0 3BLAKE2s (dnsdist-1.8.0.tar.bz2) = df588b2f19ab27b71e7e7132385bc6b12e8f48bd51e22d493753926d3557a592
4SHA512 (dnsdist-1.7.2.tar.bz2) = 2048ac0f861547fb103da1a128fd39a35ed689ccbf3c080232a3bd0550c9e7c7e01c95864d61e065e341a9f4111c974d2db2aba73eb8f7cba9bf8273da39b8a6 4SHA512 (dnsdist-1.8.0.tar.bz2) = 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
5Size (dnsdist-1.7.2.tar.bz2) = 1391588 bytes 5Size (dnsdist-1.8.0.tar.bz2) = 1480500 bytes
6SHA1 (patch-dnsdist-console.cc) = 4675ca40e738e3d9e15d9a3c6993e1adce102a30 6SHA1 (patch-Makefile.in) = 5b2927e63898ac38d3c7ea8c3eb28ecef2f969e4
7SHA1 (patch-dnsdist.cc) = 8d3f167e38b6b67bb4d9b7f06dcc0245cf6c904f 7SHA1 (patch-configure) = b5921f1589ad9137405e29d117460c4e4c932908
 8SHA1 (patch-dnsdist-console.cc) = 09b76a844d79aef33c898bf3b833f4dce642b1a5
 9SHA1 (patch-dnsdist.cc) = c6007886a4cc5e97ac6ec1e54f983ebe3a96cf4b
8SHA1 (patch-ext_json11_json11.cpp) = 9fb12578d80103b8b92e984a483cbda98fd83db8 10SHA1 (patch-ext_json11_json11.cpp) = 9fb12578d80103b8b92e984a483cbda98fd83db8
9SHA1 (patch-iputils.hh) = 09207cd894162d634cd832f12209e38a0c253624 11SHA1 (patch-iputils.hh) = 09207cd894162d634cd832f12209e38a0c253624
10SHA1 (patch-qtype.hh) = c4db69a8f0c818789607e190bb400791b3707a50 12SHA1 (patch-qtype.hh) = 66c6c06fc6c6e770b049508b1f60a274a378ff89
File Deleted: pkgsrc/net/dnsdist/files/dnsdist.conf
cvs diff -r1.5 -r1.6 pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc (expand / switch to unified diff)

--- pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc 2020/08/06 16:28:03 1.5
+++ pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc 2023/08/22 20:31:36 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-dnsdist-console.cc,v 1.5 2020/08/06 16:28:03 adam Exp $ 1$NetBSD: patch-dnsdist-console.cc,v 1.6 2023/08/22 20:31:36 adam Exp $
2 2
3Always use the pkgsrc editline layout. 3Always use the pkgsrc editline layout.
4 4
5--- dnsdist-console.cc.orig 2020-07-28 07:39:28.000000000 +0000 5--- dnsdist-console.cc.orig 2023-03-28 11:06:46.000000000 +0000
6+++ dnsdist-console.cc 6+++ dnsdist-console.cc
7@@ -24,7 +24,7 @@ 7@@ -27,7 +27,7 @@
8 #include <pwd.h> 
9 #include <thread> 8 #include <thread>
10  9
 10 #ifdef HAVE_LIBEDIT
11-#if defined (__OpenBSD__) || defined(__NetBSD__) 11-#if defined (__OpenBSD__) || defined(__NetBSD__)
12+#if 1 12+#if 1
13 // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h 13 // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h
14 #undef __STRICT_ANSI__ 14 #undef __STRICT_ANSI__
15 #include <readline/readline.h> 15 #include <readline/readline.h>
cvs diff -r1.6 -r1.7 pkgsrc/net/dnsdist/patches/patch-dnsdist.cc (expand / switch to unified diff)

--- pkgsrc/net/dnsdist/patches/patch-dnsdist.cc 2020/08/06 16:28:03 1.6
+++ pkgsrc/net/dnsdist/patches/patch-dnsdist.cc 2023/08/22 20:31:36 1.7
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-dnsdist.cc,v 1.6 2020/08/06 16:28:03 adam Exp $ 1$NetBSD: patch-dnsdist.cc,v 1.7 2023/08/22 20:31:36 adam Exp $
2 2
3Always use the pkgsrc editline layout. 3Always use the pkgsrc editline layout.
4 4
5--- dnsdist.cc.orig 2020-07-29 16:09:33.000000000 +0000 5--- dnsdist.cc.orig 2023-03-28 11:06:46.000000000 +0000
6+++ dnsdist.cc 6+++ dnsdist.cc
7@@ -31,7 +31,7 @@ 7@@ -33,7 +33,7 @@
8 #include <sys/resource.h> 
9 #include <unistd.h> 8 #include <unistd.h>
10  9
 10 #ifdef HAVE_LIBEDIT
11-#if defined (__OpenBSD__) || defined(__NetBSD__) 11-#if defined (__OpenBSD__) || defined(__NetBSD__)
12+#if 1 12+#if 1
13 // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h 13 // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h
14 #undef __STRICT_ANSI__ 14 #undef __STRICT_ANSI__
15 #include <readline/readline.h> 15 #include <readline/readline.h>
cvs diff -r1.2 -r1.3 pkgsrc/net/dnsdist/patches/patch-qtype.hh (expand / switch to unified diff)

--- pkgsrc/net/dnsdist/patches/patch-qtype.hh 2022/10/24 11:08:15 1.2
+++ pkgsrc/net/dnsdist/patches/patch-qtype.hh 2023/08/22 20:31:36 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-qtype.hh,v 1.2 2022/10/24 11:08:15 jperkin Exp $ 1$NetBSD: patch-qtype.hh,v 1.3 2023/08/22 20:31:36 adam Exp $
2 2
3Avoid symbol pollution on SunOS. 3Avoid symbol pollution on SunOS.
4 4
5--- qtype.hh.orig 2022-06-10 13:48:12.000000000 +0000 5--- qtype.hh.orig 2023-03-28 11:06:46.000000000 +0000
6+++ qtype.hh 6+++ qtype.hh
7@@ -22,6 +22,10 @@ 7@@ -26,6 +26,10 @@
8 #pragma once 8
9 #include "namespaces.hh" 9 #include "namespaces.hh"
10  10
11+#if defined(__sun) && defined(DS) 11+#if defined(__sun) && defined(DS)
12+#undef DS 12+#undef DS
13+#endif 13+#endif
14+ 14+
15 /** The QType class is meant to deal easily with the different kind of resource types, like 'A', 'NS', 15 /** The QType class is meant to deal easily with the different kind of resource types, like 'A', 'NS',
16 * 'CNAME' etcetera. These types have both a name and a number. This class can seamlessly move between 16 * 'CNAME' etcetera. These types have both a name and a number. This class can seamlessly move between
17 * them. Use it like this: 17 * them. Use it like this: