CVS commit: pkgsrc/net/maradns

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct  6 12:52:20 UTC 2019

Modified Files:
        pkgsrc/net/maradns: Makefile distinfo
Added Files:
        pkgsrc/net/maradns/patches: patch-deadwood-3.2.14_src_DwMain.c
Removed Files:
        pkgsrc/net/maradns/patches: patch-an

Log Message:
maradns: Update to 2.0.17

maradns-2.0.17:
This is the stable release of MaraDNS. No security updates were made.

        Deadwood updated to 3.2.14
        Default max_mem value doubled as discussed in GitHub issue #52.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/maradns/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/maradns/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/net/maradns/patches/patch-an
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/maradns/patches/patch-deadwood-3.2.14_src_DwMain.c

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

Modified files:

Index: pkgsrc/net/maradns/Makefile
diff -u pkgsrc/net/maradns/Makefile:1.28 pkgsrc/net/maradns/Makefile:1.29
--- pkgsrc/net/maradns/Makefile:1.28    Fri Jan 18 22:14:14 2019
+++ pkgsrc/net/maradns/Makefile Sun Oct  6 12:52:20 2019
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2019/01/18 22:14:14 bsiegert Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/06 12:52:20 nia Exp $
 
-DISTNAME=      maradns-2.0.16
+DISTNAME=      maradns-2.0.17
 CATEGORIES=    net
-MASTER_SITES=  http://www.maradns.org/download/2.0/${PKGVERSION_NOREV}/
+MASTER_SITES=  https://maradns.samiam.org/download/2.0/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    ddeus.pkgsrc%mailnull.com@localhost
-HOMEPAGE=      http://www.maradns.org/
+HOMEPAGE=      https://maradns.samiam.org/
 COMMENT=       Secure DNS server for *NIX systems
 LICENSE=       2-clause-bsd
 
@@ -26,7 +26,7 @@ LDFLAGS+=     ${PTHREAD_LIBS}
 SUBST_CLASSES+=                sysconf
 SUBST_STAGE.sysconf=   pre-configure
 SUBST_VARS.sysconf=    PKG_SYSCONFDIR
-SUBST_FILES.sysconf=   parse/ParseMaraRc.c MaraDns.h deadwood-3.2.09/src/DwMain.c
+SUBST_FILES.sysconf=   parse/ParseMaraRc.c MaraDns.h deadwood-3.2.14/src/DwMain.c
 
 .include "options.mk"
 

Index: pkgsrc/net/maradns/distinfo
diff -u pkgsrc/net/maradns/distinfo:1.16 pkgsrc/net/maradns/distinfo:1.17
--- pkgsrc/net/maradns/distinfo:1.16    Fri Jan 18 22:14:14 2019
+++ pkgsrc/net/maradns/distinfo Sun Oct  6 12:52:20 2019
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.16 2019/01/18 22:14:14 bsiegert Exp $
+$NetBSD: distinfo,v 1.17 2019/10/06 12:52:20 nia Exp $
 
-SHA1 (maradns-2.0.16.tar.bz2) = 56dbc3b5471be8b5f18421cc3b02eafb6665703d
-RMD160 (maradns-2.0.16.tar.bz2) = cff6ef5f708a4db4c0b61eda6691857327174003
-SHA512 (maradns-2.0.16.tar.bz2) = 9959a7b6724aff5561fa9303b3d7c967e298fd63d95ef7e34d80514dde8871c19887c184a6466779f2833c295233dd1d54a7c06928ac58dcbb374281deb13f17
-Size (maradns-2.0.16.tar.bz2) = 1127504 bytes
+SHA1 (maradns-2.0.17.tar.bz2) = deb7ea8ec2a78275b31fccc4acf103330c04b7e7
+RMD160 (maradns-2.0.17.tar.bz2) = 27b0163058a8704a7d1d37e8436627eed3c292c0
+SHA512 (maradns-2.0.17.tar.bz2) = 375f35b6aa6f8a64dfaf04009b2c543d3f176ff4380923ea52af71296956fe4310eba0edf319bf7b545272bfce8818991d6b731e8428607ae3b8778d062dcd52
+Size (maradns-2.0.17.tar.bz2) = 1135103 bytes
 SHA1 (patch-aa) = c1fb0e8824b1cedbb94507d83aa5d8272c937194
 SHA1 (patch-ab) = 7dff57289ca7096e5795d5af1356c81447fd0544
 SHA1 (patch-ac) = d5e3567cf721dab9574aca53111c75c975e6914d
 SHA1 (patch-ad) = c64a5995253d9dc91273fc49358dbb53f451ff9d
 SHA1 (patch-ae) = 46b40b72eb783bad924376ceae56eec27d9df8c6
 SHA1 (patch-am) = a7bbfa3deea2d3f63e78703ee523c8aa1d1ab56c
-SHA1 (patch-an) = 46646152fce98410b86a5602deb12574ea14de76
+SHA1 (patch-deadwood-3.2.14_src_DwMain.c) = 5971a047df8ef540a1f863a02ed04b74b49e61b0

Added files:

Index: pkgsrc/net/maradns/patches/patch-deadwood-3.2.14_src_DwMain.c
diff -u /dev/null pkgsrc/net/maradns/patches/patch-deadwood-3.2.14_src_DwMain.c:1.1
--- /dev/null   Sun Oct  6 12:52:20 2019
+++ pkgsrc/net/maradns/patches/patch-deadwood-3.2.14_src_DwMain.c       Sun Oct  6 12:52:20 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-deadwood-3.2.14_src_DwMain.c,v 1.1 2019/10/06 12:52:20 nia Exp $
+
+Support PKG_SYSCONFDIR.
+
+--- deadwood-3.2.14/src/DwMain.c.orig  2019-01-20 16:22:47.000000000 +0000
++++ deadwood-3.2.14/src/DwMain.c
+@@ -66,7 +66,7 @@ void dw_parse_args(int argc, char **argv
+                 process_mararc(argv[2]);
+         } else {
+ #ifndef MINGW
+-                process_mararc("/etc/dwood3rc");
++                process_mararc("@PKG_SYSCONFDIR@/maradns/dwood3rc");
+ #else /* MINGW */
+                 process_mararc("dwood3rc.txt");
+ #endif /* MINGW */