Address PR pkg/30957 with a new 'djbdns-listenmultiple' option to apply

these patches:

- Uwe Ohse's djbdns-1.05-multiip.diff for tinydns
- Dan Peterson's dnscache-1.05-multiple-ip.patch for dnscache

The patches came with different list separators, but this is pkgsrc! The
default separator for both is now a comma, and you can override it by
setting DJBDNS_IP_SEPARATOR. (Add that to BUILD_DEFS if the option was
enabled, and unconditionally add all the users and groups.) Bump
PKGREVISION.

While here, make djbdns-1.05-ignoreip2.patch fetchable via archive.org.

3 files changed, 32 insertions, 6 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 6d6ceeff9c5..6bf57015faf 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2020/06/25 05:42:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.72 2020/10/03 12:59:36 schmonz Exp $
 
 DISTNAME=		djbdns-1.05
-PKGREVISION=		14
+PKGREVISION=		15
 CATEGORIES=		net
 MASTER_SITES=		http://cr.yp.to/djbdns/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
@@ -31,6 +31,9 @@ CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 CONF_FILES+=		${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
 BUILD_DEFS+=		PKG_SYSCONFBASE
+BUILD_DEFS+=		DJBDNS_AXFR_USER DJBDNS_CACHE_USER DJBDNS_LOG_USER
+BUILD_DEFS+=		DJBDNS_RBL_USER DJBDNS_TINY_USER
+BUILD_DEFS+=		DJBDNS_DJBDNS_GROUP
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/${PKGBASE}
 
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index bb11a03cd35..0817138e8d3 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2018/09/28 20:36:24 schmonz Exp $
+$NetBSD: distinfo,v 1.28 2020/10/03 12:59:36 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -8,6 +8,10 @@ SHA1 (djbdns-1.05-man-20031023.tar.gz) = 3bac8a34a4bc681b9a0e603a77fa11492619e3c
 RMD160 (djbdns-1.05-man-20031023.tar.gz) = 42a5b3305513851dfe1da46df6f405bc81602fbe
 SHA512 (djbdns-1.05-man-20031023.tar.gz) = 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 Size (djbdns-1.05-man-20031023.tar.gz) = 17170 bytes
+SHA1 (dnscache-1.05-multiple-ip.patch) = 0f1bb62d7cc1002ffb6227248fce827df9ddbd4e
+RMD160 (dnscache-1.05-multiple-ip.patch) = 5061d1c545f66efe9cf2158e6edda613dce79f8e
+SHA512 (dnscache-1.05-multiple-ip.patch) = 0a20ea2bc3a72f0879dc1848748f7170efbc41133602a61ec006cb01c1431a77d5d63e618d7fa536522a85647082e4a080fbe0a59c256b0f43117177d40eb504
+Size (dnscache-1.05-multiple-ip.patch) = 7601 bytes
 SHA1 (djbdns-1.05-test28.diff.xz) = 92abf8b17368a8b2924fe6e5eb9ada988defbc6c
 RMD160 (djbdns-1.05-test28.diff.xz) = 2ee73a5b2080f6b20ded49b74999889f996bb8cc
 SHA512 (djbdns-1.05-test28.diff.xz) = 7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
@@ -16,6 +20,10 @@ SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
 RMD160 (djbdns-1.05-ignoreip2.patch) = bf8a0d38ae7bfb09a8ab2a04600680613db10aaa
 SHA512 (djbdns-1.05-ignoreip2.patch) = 4e7075c7400374c954fcf15b4c30d226a3e952da780cf77e1c303a7b350d069252c999da1f29e56100cb8964d1583e843a0acee1009f88551fea9040ca41145b
 Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes
+SHA1 (djbdns-1.05-multiip.diff) = 0850dd8269af35cc5a3601cb6c2c3ea9846098ab
+RMD160 (djbdns-1.05-multiip.diff) = 2c60f2fbed9410106ead6b007897c34690a5072f
+SHA512 (djbdns-1.05-multiip.diff) = 76a6d8120acf1cbeb1778d1eecc388548a401a59b080656bb8d4e0995de32347fece7c127c1e72c26a3768273d342dfa4491969efb6ac9d7be9172e9908d980c
+Size (djbdns-1.05-multiip.diff) = 5522 bytes
 SHA1 (djbdns-cachestats.patch) = ab0b2835140768d89159d5564534d39520d7f403
 RMD160 (djbdns-cachestats.patch) = e09994d84573e781ce18b59f909f8bd013de5d8e
 SHA512 (djbdns-cachestats.patch) = e78b6a8fc43f94e5bc5971d85f952ef9cac4fa827b00036994fa51dcebb9c9755c36488ac24a9ec7b92097a38938191147faf8cce84a9e636072684db28a2e62
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index 706ca0eb16d..74a710a8b7a 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.23 2019/11/03 11:45:33 rillig Exp $
+# $NetBSD: options.mk,v 1.24 2020/10/03 12:59:36 schmonz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.djbdns
-PKG_SUPPORTED_OPTIONS+=		djbdns-cachestats djbdns-ignoreip2
+PKG_SUPPORTED_OPTIONS+=		djbdns-cachestats djbdns-ignoreip2 djbdns-listenmultiple
 PKG_SUPPORTED_OPTIONS+=		djbdns-mergequeries djbdns-tinydns64
 PKG_SUGGESTED_OPTIONS+=		djbdns-mergequeries djbdns-tinydns64
 
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP.${CACHESTATS_PATCH}=	-p1
 .if !empty(PKG_OPTIONS:Mdjbdns-ignoreip2)
 IGNOREIP2_PATCH=		djbdns-1.05-ignoreip2.patch
 PATCHFILES+=			${IGNOREIP2_PATCH}
-SITES.${IGNOREIP2_PATCH}=	http://www.tinydns.org/
+SITES.${IGNOREIP2_PATCH}=	https://web.archive.org/web/20140104070725/http://tinydns.org/
 .endif
 
 .if !empty(PKG_OPTIONS:Mdjbdns-mergequeries)
@@ -29,6 +29,21 @@ patch-mergequeries:
 	cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-mergequeries-boundscheck
 .endif
 
+.if !empty(PKG_OPTIONS:Mdjbdns-listenmultiple)
+TINYMULTI_PATCH=			djbdns-1.05-multiip.diff
+CACHEMULTI_PATCH=			dnscache-1.05-multiple-ip.patch
+PATCHFILES+=				${TINYMULTI_PATCH} ${CACHEMULTI_PATCH}
+SITES.${TINYMULTI_PATCH}=		https://ohse.de/uwe/patches/
+SITES.${CACHEMULTI_PATCH}=		https://web.archive.org/web/20070905064205/http://danp.net/djbdns/
+PATCH_DIST_STRIP.${TINYMULTI_PATCH}=	-p1
+PATCH_DIST_STRIP.${CACHEMULTI_PATCH}=	-p1
+BUILD_DEFS+=				DJBDNS_IP_SEPARATOR
+PATCH_DIST_CAT.${TINYMULTI_PATCH}=	${SED} -e "s|','|'${DJBDNS_IP_SEPARATOR}'|g" \
+					< ${TINYMULTI_PATCH}
+PATCH_DIST_CAT.${CACHEMULTI_PATCH}=	${SED} -e "s|'/'|'${DJBDNS_IP_SEPARATOR}'|g" \
+					< ${CACHEMULTI_PATCH}
+.endif
+
 .if !empty(PKG_OPTIONS:Mdjbdns-tinydns64)
 USE_TOOLS+=			patch
 post-patch: patch-tinydns64