CVS commit: pkgsrc/net/dnsdist

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 22 20:31:36 UTC 2023

Modified Files:
        pkgsrc/net/dnsdist: Makefile distinfo
        pkgsrc/net/dnsdist/patches: patch-dnsdist-console.cc patch-dnsdist.cc
            patch-qtype.hh
Removed Files:
        pkgsrc/net/dnsdist/files: dnsdist.conf

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/dnsdist/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/dnsdist/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/dnsdist/files/dnsdist.conf
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/dnsdist/patches/patch-dnsdist.cc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/dnsdist/patches/patch-qtype.hh

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

Modified files:

Index: pkgsrc/net/dnsdist/Makefile
diff -u pkgsrc/net/dnsdist/Makefile:1.20 pkgsrc/net/dnsdist/Makefile:1.21
--- pkgsrc/net/dnsdist/Makefile:1.20    Tue Jun  6 10:51:59 2023
+++ pkgsrc/net/dnsdist/Makefile Tue Aug 22 20:31:36 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2023/06/06 10:51:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2023/08/22 20:31:36 adam Exp $
 
-DISTNAME=      dnsdist-1.7.2
-PKGREVISION=   2
+DISTNAME=      dnsdist-1.8.0
 CATEGORIES=    net
 MASTER_SITES=  https://downloads.powerdns.com/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -11,9 +10,9 @@ HOMEPAGE=     https://dnsdist.org/
 COMMENT=       Highly DNS-, DoS- and abuse-aware loadbalancer
 LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++11
 USE_TOOLS+=    gmake pkg-config
+GNU_CONFIGURE= yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,20 +41,19 @@ CONFIGURE_ARGS+=    --without-net-snmp
 CONFIGURE_ENV+=                LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.editlinereadline}/include"
 CONFIGURE_ENV+=                LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.editlinereadline}/lib ${BUILDLINK_LDADD.editlinereadline}"
 
-INSTALLATION_DIRS+=    share/examples/dnsdist
 RCD_SCRIPTS+=          dnsdist
 
 post-install:
-       ${INSTALL_DATA} ${.CURDIR}/files/dnsdist.conf \
-               ${DESTDIR}${PREFIX}/share/examples/dnsdist
+       cd ${DESTDIR}${PREFIX} && \
+       ${MV} share/examples/dnsdist/dnsdist.conf-dist share/examples/dnsdist/dnsdist.conf || ${TRUE}
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/re2/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
-.include "../../mk/atomic64.mk"
-.include "../../mk/readline.buildlink3.mk"
 .include "../../net/fstrm/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/nghttp2/buildlink3.mk"
+.include "../../mk/atomic64.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/dnsdist/distinfo
diff -u pkgsrc/net/dnsdist/distinfo:1.13 pkgsrc/net/dnsdist/distinfo:1.14
--- pkgsrc/net/dnsdist/distinfo:1.13    Mon Oct 24 11:08:14 2022
+++ pkgsrc/net/dnsdist/distinfo Tue Aug 22 20:31:36 2023
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.13 2022/10/24 11:08:14 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2023/08/22 20:31:36 adam Exp $
 
-BLAKE2s (dnsdist-1.7.2.tar.bz2) = 0daadb638e58c3142ed9cfe160b2f879fed1dd033aa3e4640e154c3002141fb0
-SHA512 (dnsdist-1.7.2.tar.bz2) = 2048ac0f861547fb103da1a128fd39a35ed689ccbf3c080232a3bd0550c9e7c7e01c95864d61e065e341a9f4111c974d2db2aba73eb8f7cba9bf8273da39b8a6
-Size (dnsdist-1.7.2.tar.bz2) = 1391588 bytes
-SHA1 (patch-dnsdist-console.cc) = 4675ca40e738e3d9e15d9a3c6993e1adce102a30
-SHA1 (patch-dnsdist.cc) = 8d3f167e38b6b67bb4d9b7f06dcc0245cf6c904f
+BLAKE2s (dnsdist-1.8.0.tar.bz2) = df588b2f19ab27b71e7e7132385bc6b12e8f48bd51e22d493753926d3557a592
+SHA512 (dnsdist-1.8.0.tar.bz2) = 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
+Size (dnsdist-1.8.0.tar.bz2) = 1480500 bytes
+SHA1 (patch-Makefile.in) = 5b2927e63898ac38d3c7ea8c3eb28ecef2f969e4
+SHA1 (patch-configure) = b5921f1589ad9137405e29d117460c4e4c932908
+SHA1 (patch-dnsdist-console.cc) = 09b76a844d79aef33c898bf3b833f4dce642b1a5
+SHA1 (patch-dnsdist.cc) = c6007886a4cc5e97ac6ec1e54f983ebe3a96cf4b
 SHA1 (patch-ext_json11_json11.cpp) = 9fb12578d80103b8b92e984a483cbda98fd83db8
 SHA1 (patch-iputils.hh) = 09207cd894162d634cd832f12209e38a0c253624
-SHA1 (patch-qtype.hh) = c4db69a8f0c818789607e190bb400791b3707a50
+SHA1 (patch-qtype.hh) = 66c6c06fc6c6e770b049508b1f60a274a378ff89

Index: pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc
diff -u pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc:1.5 pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc:1.6
--- pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc:1.5     Thu Aug  6 16:28:03 2020
+++ pkgsrc/net/dnsdist/patches/patch-dnsdist-console.cc Tue Aug 22 20:31:36 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-dnsdist-console.cc,v 1.5 2020/08/06 16:28:03 adam Exp $
+$NetBSD: patch-dnsdist-console.cc,v 1.6 2023/08/22 20:31:36 adam Exp $
 
 Always use the pkgsrc editline layout.
 
---- dnsdist-console.cc.orig    2020-07-28 07:39:28.000000000 +0000
+--- dnsdist-console.cc.orig    2023-03-28 11:06:46.000000000 +0000
 +++ dnsdist-console.cc
-@@ -24,7 +24,7 @@
- #include <pwd.h>
+@@ -27,7 +27,7 @@
  #include <thread>
  
+ #ifdef HAVE_LIBEDIT
 -#if defined (__OpenBSD__) || defined(__NetBSD__)
 +#if 1
  // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h

Index: pkgsrc/net/dnsdist/patches/patch-dnsdist.cc
diff -u pkgsrc/net/dnsdist/patches/patch-dnsdist.cc:1.6 pkgsrc/net/dnsdist/patches/patch-dnsdist.cc:1.7
--- pkgsrc/net/dnsdist/patches/patch-dnsdist.cc:1.6     Thu Aug  6 16:28:03 2020
+++ pkgsrc/net/dnsdist/patches/patch-dnsdist.cc Tue Aug 22 20:31:36 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-dnsdist.cc,v 1.6 2020/08/06 16:28:03 adam Exp $
+$NetBSD: patch-dnsdist.cc,v 1.7 2023/08/22 20:31:36 adam Exp $
 
 Always use the pkgsrc editline layout.
 
---- dnsdist.cc.orig    2020-07-29 16:09:33.000000000 +0000
+--- dnsdist.cc.orig    2023-03-28 11:06:46.000000000 +0000
 +++ dnsdist.cc
-@@ -31,7 +31,7 @@
- #include <sys/resource.h>
+@@ -33,7 +33,7 @@
  #include <unistd.h>
  
+ #ifdef HAVE_LIBEDIT
 -#if defined (__OpenBSD__) || defined(__NetBSD__)
 +#if 1
  // If this is not undeffed, __attribute__ wil be redefined by /usr/include/readline/rlstdc.h

Index: pkgsrc/net/dnsdist/patches/patch-qtype.hh
diff -u pkgsrc/net/dnsdist/patches/patch-qtype.hh:1.2 pkgsrc/net/dnsdist/patches/patch-qtype.hh:1.3
--- pkgsrc/net/dnsdist/patches/patch-qtype.hh:1.2       Mon Oct 24 11:08:15 2022
+++ pkgsrc/net/dnsdist/patches/patch-qtype.hh   Tue Aug 22 20:31:36 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-qtype.hh,v 1.2 2022/10/24 11:08:15 jperkin Exp $
+$NetBSD: patch-qtype.hh,v 1.3 2023/08/22 20:31:36 adam Exp $
 
 Avoid symbol pollution on SunOS.
 
---- qtype.hh.orig      2022-06-10 13:48:12.000000000 +0000
+--- qtype.hh.orig      2023-03-28 11:06:46.000000000 +0000
 +++ qtype.hh
-@@ -22,6 +22,10 @@
- #pragma once
+@@ -26,6 +26,10 @@
+ 
  #include "namespaces.hh"
  
 +#if defined(__sun) && defined(DS)