Re: update to dnsdist 1.8.0

On Thu, Mar 30, 2023 at 05:21:16PM +0100, Stuart Henderson wrote:

> On 2023/03/30 15:50, Otto Moerbeek wrote:
> > Hi,
> >
> > Did I do the PLIST correctly? The dnsdistconf.lua conf file was the
> > only one in share/examples/dnsdist
> >
> > OK?
> >
> > -Otto
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /home/cvs/ports/net/dnsdist/Makefile,v
> > retrieving revision 1.31
> > diff -u -p -r1.31 Makefile
> > --- Makefile 8 Nov 2022 11:14:54 -0000 1.31
> > +++ Makefile 30 Mar 2023 13:47:51 -0000
> > @@ -1,8 +1,7 @@
> > COMMENT= highly DNS-, DoS- and abuse-aware loadbalancer
> >
> > -DISTNAME= dnsdist-1.7.3
> > +DISTNAME= dnsdist-1.8.0
> > EXTRACT_SUFX= .tar.bz2
> > -REVISION= 0
> >
> > CATEGORIES= net
> >
> > @@ -58,8 +57,7 @@ LIB_DEPENDS+= ${MODLUA_LIB_DEPENDS} \
> > www/nghttp2
> >
> > post-install:
> > - ${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/dnsdist
> > - cd ${WRKSRC}; ${INSTALL_DATA} README.md ${PREFIX}/share/doc/dnsdist/; \
> > - ${INSTALL_DATA} dnsdistconf.lua ${PREFIX}/share/examples/dnsdist/
>
> How about using dnsdist.conf-dist instead? It seems helpful to have an
> example file.

Like this?

-Otto

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/net/dnsdist/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 8 Nov 2022 11:14:54 -0000 1.31
+++ Makefile 30 Mar 2023 18:01:43 -0000
@@ -1,8 +1,7 @@
COMMENT= highly DNS-, DoS- and abuse-aware loadbalancer

-DISTNAME= dnsdist-1.7.3
+DISTNAME= dnsdist-1.8.0
EXTRACT_SUFX= .tar.bz2
-REVISION= 0

CATEGORIES= net

@@ -60,6 +59,6 @@ LIB_DEPENDS+= ${MODLUA_LIB_DEPENDS} \
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/dnsdist
cd ${WRKSRC}; ${INSTALL_DATA} README.md ${PREFIX}/share/doc/dnsdist/; \
- ${INSTALL_DATA} dnsdistconf.lua ${PREFIX}/share/examples/dnsdist/
+ ${INSTALL_DATA} dnsdist.conf-dist ${PREFIX}/share/examples/dnsdist/

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/net/dnsdist/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 2 Nov 2022 15:10:05 -0000 1.15
+++ distinfo 30 Mar 2023 18:01:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (dnsdist-1.7.3.tar.bz2) = fq9vrC8mVlxdhljUKiE3meBfTTvGjnxxbnF030ExWIY=
-SIZE (dnsdist-1.7.3.tar.bz2) = 1379011
+SHA256 (dnsdist-1.8.0.tar.bz2) = HA03XCVFPTSbiOA/9YmqJgPKhpL8mDZMBo6tNygEcE8=
+SIZE (dnsdist-1.8.0.tar.bz2) = 1480500
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/net/dnsdist/patches/patch-configure_ac,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure_ac
--- patches/patch-configure_ac 11 Mar 2022 19:45:54 -0000 1.7
+++ patches/patch-configure_ac 30 Mar 2023 18:01:43 -0000
@@ -1,14 +1,14 @@
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
-@@ -18,8 +18,8 @@ AC_DEFINE([DNSDIST], [1],
+@@ -16,8 +16,8 @@ AC_DEFINE([DNSDIST], [1],
LT_PREREQ([2.2.2])
LT_INIT([disable-static])

--CFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter $CFLAGS"
--CXXFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls $CXXFLAGS"
-+CFLAGS="-g -Wall -Wextra -Wshadow -Wno-unused-parameter $CFLAGS"
-+CXXFLAGS="-g -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls $CXXFLAGS"
+-CFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter -fvisibility=hidden $CFLAGS"
+-CXXFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls -fvisibility=hidden $CXXFLAGS"
++CFLAGS="-g -Wall -Wextra -Wshadow -Wno-unused-parameter -fvisibility=hidden $CFLAGS"
++CXXFLAGS="-g -Wall -Wextra -Wshadow -Wno-unused-parameter -Wmissing-declarations -Wredundant-decls -fvisibility=hidden $CXXFLAGS"

PDNS_WITH_LIBSODIUM
PDNS_CHECK_DNSTAP([auto])
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/net/dnsdist/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 8 Nov 2022 11:14:54 -0000 1.7
+++ pkg/PLIST 30 Mar 2023 18:01:43 -0000
@@ -7,7 +7,7 @@ share/doc/dnsdist/
share/doc/dnsdist/README.md
share/examples/dnsdist/
@sample ${SYSCONFDIR}/
-share/examples/dnsdist/dnsdistconf.lua
+share/examples/dnsdist/dnsdist.conf-dist
@mode 640
@group _dnsdist
@sample ${SYSCONFDIR}/dnsdist.conf