Subject: maradns and regarding NetBSD PR 24587
To: maintainer for pkgsrc/net/maradns <pancake@phreaker.net>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 03/31/2004 11:01:15
I see you are the maintainer for pkgsrc/net/maradns.

Can you have a look at the PR 24587?

http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=24587

I didn't provide a fix, because I tried to update first, and it wouldn't
work for me. The man page doesn't even mention any daemonize feature.

I also sent this email to tech-pkg. Does anyone use MaraDNS? Can anyone
test new version?

Also, I started updating to latest MaraDNS stable release 1.0.20. I had to
recreate patches aa and ab but they are basically the same.

Then it doesn't build still because timestamp.o is built in wrong
directory.

Here is a patch for that (based on patch from FreeBSD ports):
$NetBSD$

--- parse/Makefile.orig	Sat Aug  2 12:39:36 2003
+++ parse/Makefile
@@ -1,7 +1,7 @@
 JOBJS=../libs/JsStr.o ../libs/JsStrOS.o ../libs/JsStrCP.o
 MJOBJS=../libs/MaraHash.o
 POBJECTS=ParseMaraRc.o ParseCsv1.o ParseIpAcl.o
-DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o
../dns/Decompress.o ../server/timestamp.o
+DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o
../dns/Decompress.o
 OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS)
 EXECS=parsetest parsetest2

@@ -25,9 +25,9 @@ ParseCsv1.o: ParseCsv1.c ../libs/JsStr.h
 ParseIpAcl.o: ParseIpAcl.c ../libs/JsStr.h ../libs/MaraHash.h
../MaraDns.h
 	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c

-parsetest: parsetest.c $(OBJECTS)
-	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS)
+parsetest: parsetest.c $(OBJECTS) ../server/timestamp.o
+	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) timestamp.o

-parsetest2: parsetest2.c $(OBJECTS)
-	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS)
+parsetest2: parsetest2.c $(OBJECTS) ../server/timestamp.o
+	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) timestamp.o



Also I had to remake patch-ab (but I don't know why). Here is the upgrade
to 1.0.20 which doesn't work for me:

  6293 maradns  CALL  socket(0x2,0x2,0)
  6293 maradns  RET   socket 3
  6293 maradns  CALL  bind(0x3,0xbfbfd9b8,0x10)
  6293 maradns  RET   bind -1 errno 49 Can't assign requested address

(Even though I run as root and don't have anything already listening on
port 53.)

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/maradns/Makefile,v
retrieving revision 1.5
diff -b -u -r1.5 Makefile
--- Makefile	14 Nov 2003 21:19:03 -0000	1.5
+++ Makefile	31 Mar 2004 18:55:59 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.5 2003/11/14 21:19:03 cube Exp $

-DISTNAME=	maradns-1.0.18
-PKGREVISION=	1
+DISTNAME=	maradns-1.0.20
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/
 EXTRACT_SUFX=	.tar.bz2
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/maradns/distinfo,v
retrieving revision 1.4
diff -b -u -r1.4 distinfo
--- distinfo	14 Nov 2003 21:19:03 -0000	1.4
+++ distinfo	31 Mar 2004 18:55:59 -0000
@@ -1,8 +1,9 @@
 $NetBSD: distinfo,v 1.4 2003/11/14 21:19:03 cube Exp $

-SHA1 (maradns-1.0.18.tar.bz2) = 788b875bed781f11dea8f4d38209e4bd49dc42d8
-Size (maradns-1.0.18.tar.bz2) = 414047 bytes
-SHA1 (patch-aa) = c33101aacf39c6cf4fe361d82c7e48882a33e37c
-SHA1 (patch-ab) = 664188f15cc8068fb8d7572d2fef7870cd998ab7
+SHA1 (maradns-1.0.20.tar.bz2) = 53b09e0c03e224176b250bce0f3dd6caf58ad699
+Size (maradns-1.0.20.tar.bz2) = 418540 bytes
+SHA1 (patch-aa) = ddaad3e473a62f0c6ff707c959f0389ded6752f3
+SHA1 (patch-ab) = dd21bc9833cefc29aed829343ec6928b7dea96a7
 SHA1 (patch-ac) = 62bc0b967a16cf4a452b3132e11851078ee73af1
 SHA1 (patch-ad) = c824827384ab30aafb6a110daabb3f38f58b9599
+SHA1 (patch-ae) = 663dd8e64272287c8ab2210dfb20ebc6e4bda75b
cvs diff: Diffing files
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/net/maradns/patches/patch-aa,v
retrieving revision 1.2
diff -b -u -r1.2 patch-aa
--- patches/patch-aa	14 Nov 2003 21:19:03 -0000	1.2
+++ patches/patch-aa	31 Mar 2004 18:55:59 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/11/14 21:19:03 cube Exp $
+$NetBSD$

---- server/Makefile.orig	2002-08-27 05:11:46.000000000 +0200
+--- server/Makefile.orig	Sat Aug  2 12:39:36 2003
 +++ server/Makefile
 @@ -15,7 +15,7 @@ EXECS=maradns
  #FLAGS = -g $(DEBUG) -DNOTHREAD -DDEBUG
  #FLAGS = -g -DDEBUG_MEMORY $(DEBUG)
  #FLAGS = -g $(DEBUG)
--FLAGS = -O2 -Wall $(DEBUG)
-+FLAGS = -O2 -Wall $(DEBUG) ${CFLAGS}
+-FLAGS = -g -O2 -Wall $(DEBUG)
++FLAGS = -g -O2 -Wall $(DEBUG) ${CFLAGS}

  all: $(EXECS)

Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/net/maradns/patches/patch-ab,v
retrieving revision 1.1
diff -b -u -r1.1 patch-ab
--- patches/patch-ab	14 Nov 2003 21:19:03 -0000	1.1
+++ patches/patch-ab	31 Mar 2004 18:55:59 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2003/11/14 21:19:03 cube Exp $
+$NetBSD$

---- configure.orig	2002-01-24 07:43:44.000000000 +0100
+--- configure.orig	Wed Jan 23 22:43:44 2002
 +++ configure
 @@ -72,6 +72,9 @@ elif echo $UNAME | grep -i cygwin > /dev
  	cat $BUILDDIR/Makefile.noflock >> Makefile


Also, it would be good to create maradns user and group
and set in example_mararc and mararc.

And maybe patch manpages for path to config.

And then send back improvements to original developer, Sam.

   Jeremy C. Reed
   http://bsd.reedmedia.net/