Fri May 6 11:36:24 2011 UTC ()
Update maradns to 1.4.06.

   maradns-1.4.06:

   This is the stable branch of MaraDNS.

       * Fix for CVE-2011-0520
       * Deadwood updated to 3.0.02

     (2011.01.28)

   maradns-1.4.05:

   This is a stable branch of MaraDNS.

       * Deadwood updated to the stable 3.0.01 release.
       * MicroDNS now returns "not implemented" when given an EDNS packet
       * FAQ updated.

     (2010.09.25)

   maradns-1.4.04:

   This is the stable branch of MaraDNS.

       * Bugfix: NAPTR records now work when ~ is used to separate
         records
       * NAPTR records now documented
       * Bugfix: ANY queries now correctly work with NS referrals
       * Example IPv6 addresses now use RFC-4193 compliant IPs
       * Website updated to point out that Deadwood is now feature
         complete and ready for beta-testing
       * Some updates to the SQA regressions
       * Deadwood updated to Deadwood 2.9.02
       * Windows-only mkSecretTxt program added (*NIX users can
         just type in "dd if=/dev/urandom of=secret.txt bs=64
         count=1"; this gives Windows the same ability).

     (2010.07.31)


(obache)
diff -r1.22 -r1.23 pkgsrc/net/maradns/Makefile
diff -r1.11 -r1.12 pkgsrc/net/maradns/distinfo
diff -r1.3 -r1.4 pkgsrc/net/maradns/patches/patch-ad
cvs diff -r1.22 -r1.23 pkgsrc/net/maradns/Makefile (expand / switch to unified diff)

--- pkgsrc/net/maradns/Makefile 2010/06/25 21:40:32 1.22
+++ pkgsrc/net/maradns/Makefile 2011/05/06 11:36:23 1.23
@@ -1,36 +1,35 @@ @@ -1,36 +1,35 @@
1# $NetBSD: Makefile,v 1.22 2010/06/25 21:40:32 joerg Exp $ 1# $NetBSD: Makefile,v 1.23 2011/05/06 11:36:23 obache Exp $
2 2
3DISTNAME= maradns-1.4.03 3DISTNAME= maradns-1.4.06
4PKGREVISION= 1 
5CATEGORIES= net 4CATEGORIES= net
6MASTER_SITES= http://www.maradns.org/download/1.4/${DISTNAME:S/maradns-//}/ 5MASTER_SITES= http://www.maradns.org/download/1.4/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.maradns.org/ 9HOMEPAGE= http://www.maradns.org/
11COMMENT= Secure DNS server for *NIX systems 10COMMENT= Secure DNS server for *NIX systems
12 11
13USE_TOOLS+= awk:build 12USE_TOOLS+= awk:build
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
18PTHREAD_OPTS+= require 17PTHREAD_OPTS+= require
19PTHREAD_AUTO_VARS= yes 18PTHREAD_AUTO_VARS= yes
20MAKE_ENV+= LANGUAGE="en" PKGMANDIR=${PKGMANDIR:Q} 19MAKE_ENV+= LANGUAGE="en"
21 20
22INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
23 ${PKGMANDIR}/man8 sbin share/examples 22 ${PKGMANDIR}/man8 sbin share/examples
24 23
25.include "../../mk/pthread.buildlink3.mk" 24.include "../../mk/pthread.buildlink3.mk"
26LDFLAGS+= ${PTHREAD_LIBS} 25LDFLAGS+= ${PTHREAD_LIBS}
27 26
28post-patch: 27SUBST_CLASSES+= sysconf
29 @${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR}, \ 28SUBST_STAGE.sysconf= pre-configure
30 ${WRKSRC}/parse/ParseMaraRc.c > ${WRKSRC}/parse/ParseMaraRc.sed 29SUBST_VARS.sysconf= PKG_SYSCONFDIR
31 @${MV} ${WRKSRC}/parse/ParseMaraRc.sed ${WRKSRC}/parse/ParseMaraRc.c 30SUBST_FILES.sysconf= parse/ParseMaraRc.c
32 31
33post-install: 32post-install:
34 cd ${DESTDIR}${PREFIX}/share/doc/maradns && ${MV} examples ../../examples/maradns 33 cd ${DESTDIR}${PREFIX}/share/doc/maradns && ${MV} examples ../../examples/maradns
35 34
36.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/net/maradns/distinfo (expand / switch to unified diff)

--- pkgsrc/net/maradns/distinfo 2010/05/23 17:30:31 1.11
+++ pkgsrc/net/maradns/distinfo 2011/05/06 11:36:23 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.11 2010/05/23 17:30:31 schwarz Exp $ 1$NetBSD: distinfo,v 1.12 2011/05/06 11:36:23 obache Exp $
2 2
3SHA1 (maradns-1.4.03.tar.bz2) = 3ffd296d6d6ee25206e44f08b6d9bd4845369d81 3SHA1 (maradns-1.4.06.tar.bz2) = 7de7481512aec606b761c10f67d2da8fc808161b
4RMD160 (maradns-1.4.03.tar.bz2) = 3c910e45b0d2ddcb8a879141ace51fffd7f95d50 4RMD160 (maradns-1.4.06.tar.bz2) = 160e0d3d64a29a5ae1c8262d6d80763a68ca7b2d
5Size (maradns-1.4.03.tar.bz2) = 987147 bytes 5Size (maradns-1.4.06.tar.bz2) = 1085986 bytes
6SHA1 (patch-aa) = 701ae5efa81273285fef83ec14b02476cb8ed36a 6SHA1 (patch-aa) = 701ae5efa81273285fef83ec14b02476cb8ed36a
7SHA1 (patch-ab) = c3b5d86477f0d61434e7b6bed7859fa36741504e 7SHA1 (patch-ab) = c3b5d86477f0d61434e7b6bed7859fa36741504e
8SHA1 (patch-ac) = 1031b4bb51f65a5cd8ca9a06ffced2ac3571873d 8SHA1 (patch-ac) = 1031b4bb51f65a5cd8ca9a06ffced2ac3571873d
9SHA1 (patch-ad) = 1676c9d144fdca85163d40e3f27aebf8087e9e64 9SHA1 (patch-ad) = c67b25691d0c49553e9efcafaebd1caa6e957b90
10SHA1 (patch-ae) = a2494061247cc4919227622de3758d6c5c8cfd86 10SHA1 (patch-ae) = a2494061247cc4919227622de3758d6c5c8cfd86
11SHA1 (patch-ai) = 7bf925bef4d0b9682af9ccea8779bab686987e2d 11SHA1 (patch-ai) = 7bf925bef4d0b9682af9ccea8779bab686987e2d
12SHA1 (patch-aj) = 1be1ad335a31d03d8def8d7bb74b7d45e814bd77 12SHA1 (patch-aj) = 1be1ad335a31d03d8def8d7bb74b7d45e814bd77
13SHA1 (patch-ak) = f7fe72709a91a74dd6ff841f7155da0bd665162e 13SHA1 (patch-ak) = f7fe72709a91a74dd6ff841f7155da0bd665162e
14SHA1 (patch-al) = 0c93aff699ed65cae6678587a46c41651db637e1 14SHA1 (patch-al) = 0c93aff699ed65cae6678587a46c41651db637e1
cvs diff -r1.3 -r1.4 pkgsrc/net/maradns/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/net/maradns/patches/patch-ad 2010/05/23 17:30:31 1.3
+++ pkgsrc/net/maradns/patches/patch-ad 2011/05/06 11:36:24 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ad,v 1.3 2010/05/23 17:30:31 schwarz Exp $ 1$NetBSD: patch-ad,v 1.4 2011/05/06 11:36:24 obache Exp $
2 2
3--- parse/ParseMaraRc.c.orig 2010-05-23 17:51:12.000000000 +0200 3--- parse/ParseMaraRc.c.orig 2010-05-23 17:51:12.000000000 +0200
4+++ parse/ParseMaraRc.c 2010-05-23 17:51:18.000000000 +0200 4+++ parse/ParseMaraRc.c 2010-05-23 17:51:18.000000000 +0200
5@@ -1037,7 +1037,7 @@ 5@@ -1037,7 +1037,7 @@
6 return JS_ERROR; 6 return JS_ERROR;
7  7
8 /* Simple and secure: We look for it in /etc/mararc */ 8 /* Simple and secure: We look for it in /etc/mararc */
9- return js_qstr2js(out,"/etc/mararc"); 9- return js_qstr2js(out,"/etc/mararc");
10+ return js_qstr2js(out,"@@PKGSYSCONFDIR@@/mararc"); 10+ return js_qstr2js(out,"@PKG_SYSCONFDIR@/mararc");
11  11
12 } 12 }
13  13