Update the port to the latest version, 0.7.13.

PR:		28389
Submitted by:	Anders Nordby <anders@fix.no>

8 files changed, 169 insertions, 32 deletions

diff --git a/dns/maradns/files/patch-dns-Makefile b/dns/maradns/files/patch-dns-Makefile
index ab78350..32a8701 100644
--- a/dns/maradns/files/patch-dns-Makefile
+++ b/dns/maradns/files/patch-dns-Makefile
@@ -1,5 +1,5 @@
---- dns/Makefile.old	Sat May 26 19:32:28 2001
-+++ dns/Makefile	Sat May 26 19:32:38 2001
+--- dns/Makefile.orig	Wed Jun 20 19:30:47 2001
++++ dns/Makefile	Mon Jun 25 00:42:32 2001
 @@ -4,7 +4,7 @@
  OBJECTS=$(DOBJECTS) $(JOBJS) $(MJOBJS)
  
@@ -9,3 +9,18 @@
  
  all: Queries.o Compress.o bobbit.o
  
+@@ -12,11 +12,11 @@
+ 	rm -f Queries.o Compress.o bobbit.o
+ 
+ Queries.o: Queries.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o Queries.o Queries.c 
++	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
+ 
+ Compress.o: Compress.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o Compress.o Compress.c 
++	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
+ 
+ bobbit.o: bobbit.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o bobbit.o bobbit.c 
++	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
+ 
diff --git a/dns/maradns/files/patch-libs-Makefile b/dns/maradns/files/patch-libs-Makefile
index c45f262..beb698f 100644
--- a/dns/maradns/files/patch-libs-Makefile
+++ b/dns/maradns/files/patch-libs-Makefile
@@ -1,5 +1,5 @@
---- libs/Makefile.old	Sat May 26 19:34:00 2001
-+++ libs/Makefile	Sat May 26 19:34:09 2001
+--- libs/Makefile.orig	Sat Jun 23 08:20:57 2001
++++ libs/Makefile	Mon Jun 25 00:44:00 2001
 @@ -1,6 +1,6 @@
  OBJECTS = JessStr.o JessStrOS.o JessStrCP.o MaraHash.o
  #FLAGS = -O2 -Wall
@@ -8,3 +8,34 @@
  
  all: tests mtest
  
+@@ -8,23 +8,23 @@
+ 	rm -f core $(OBJECTS) tests mtest
+ 
+ MaraHash.o: JessStr.h MaraHash.c
+-	gcc -c $(FLAGS) -o MaraHash.o MaraHash.c
++	$(CC) -c $(FLAGS) -o MaraHash.o MaraHash.c
+ 
+ JessStr.o: JessStr.h JessStr.c
+-	gcc -c $(FLAGS) -o JessStr.o JessStr.c 
++	$(CC) -c $(FLAGS) -o JessStr.o JessStr.c 
+ 
+ JessStrOS.o: JessStr.h JessStrOS.c
+-	gcc -c $(FLAGS) -o JessStrOS.o JessStrOS.c 
++	$(CC) -c $(FLAGS) -o JessStrOS.o JessStrOS.c 
+ 
+ JessStrCP.o: JessStr.h JessStrCP.c
+-	gcc -c $(FLAGS) -o JessStrCP.o JessStrCP.c 
++	$(CC) -c $(FLAGS) -o JessStrCP.o JessStrCP.c 
+ 
+ mtest: mtest.c $(OBJECTS)
+-	gcc $(FLAGS) -o mtest mtest.c $(OBJECTS)
++	$(CC) $(FLAGS) -o mtest mtest.c $(OBJECTS)
+ 
+ tests: tests.c $(OBJECTS)
+-	gcc $(FLAGS) -o tests tests.c $(OBJECTS)
++	$(CC) $(FLAGS) -o tests tests.c $(OBJECTS)
+ 
+ #onetime: $(OBJECTS) kiwi.h config.h onetime.c do_scramble.o cryptdate.o
+-#	gcc $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
++#	$(CC) $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
+ 
diff --git a/dns/maradns/files/patch-parse-Makefile b/dns/maradns/files/patch-parse-Makefile
index c3e78b5..bd88096 100644
--- a/dns/maradns/files/patch-parse-Makefile
+++ b/dns/maradns/files/patch-parse-Makefile
@@ -1,11 +1,34 @@
---- parse/Makefile.old	Sat May 26 19:34:30 2001
-+++ parse/Makefile	Sat May 26 19:34:39 2001
-@@ -6,7 +6,7 @@
+--- parse/Makefile.old	Mon Jun 25 00:46:40 2001
++++ parse/Makefile	Mon Jun 25 00:47:50 2001
+@@ -5,7 +5,7 @@
+ OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS)
  EXECS=parsetest parsetest2
  
- #FLAGS = -O2
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
+-FLAGS = -O2
++FLAGS = $(CFLAGS)
+ #FLAGS = -g
  
  all: $(EXECS)
+@@ -17,17 +17,17 @@
+ 	cd libs ; make
+ 
+ ParseMaraRc.o: ParseMaraRc.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
++	$(CC) -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
+ 
+ ParseCsv1.o: ParseCsv1.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
++	$(CC) -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
+ 
+ ParseIpAcl.o: ParseIpAcl.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
++	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
+ 
+ parsetest: parsetest.c $(OBJECTS) 
+-	gcc $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
++	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
+ 
+ parsetest2: parsetest2.c $(OBJECTS) 
+-	gcc $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
++	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
  
diff --git a/dns/maradns/files/patch-server-Makefile b/dns/maradns/files/patch-server-Makefile
index 40da0f1..90112c5 100644
--- a/dns/maradns/files/patch-server-Makefile
+++ b/dns/maradns/files/patch-server-Makefile
@@ -1,18 +1,26 @@
---- server/Makefile.old	Fri May 25 07:53:30 2001
-+++ server/Makefile	Sat May 26 19:35:07 2001
-@@ -8,7 +8,7 @@
- VERSION=0.6.18
+--- server/Makefile.orig	Sun Jun 24 11:32:48 2001
++++ server/Makefile	Mon Jun 25 00:53:57 2001
+@@ -9,7 +9,7 @@
+ VERSION=0.7.13
  
  #FLAGS = -O2 -Wall
--FLAGS = -g -DDEBUG
-+FLAGS = -g -DDEBUG $(CFLAGS)
+-FLAGS = -g -DDEBUG -DNOTHREAD
++FLAGS = -g -DDEBUG -DNOTHREAD $(CFLAGS)
+ #FLAGS = -g
  
  all: $(EXECS)
+@@ -21,11 +21,11 @@
+ 	cd libs ; make
  
-@@ -25,5 +25,5 @@
- 	cc -c $(FLAGS) -o recursive.o recursive.c 
+ MaraBigHash.o: MaraBigHash.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o recursive.o recursive.c 
++	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
  
  maradns: MaraDNS.c $(OBJECTS) 
--	cc $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
-+	cc $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -pthread
+-	gcc $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -pthread
  
diff --git a/dns/maradns/files/patch-test-Makefile b/dns/maradns/files/patch-test-Makefile
index da03656..14b1285 100644
--- a/dns/maradns/files/patch-test-Makefile
+++ b/dns/maradns/files/patch-test-Makefile
@@ -1,5 +1,5 @@
---- test/Makefile.old	Sat May 26 19:35:54 2001
-+++ test/Makefile	Sat May 26 19:36:02 2001
+--- test/Makefile.orig	Wed Jun 20 19:33:02 2001
++++ test/Makefile	Mon Jun 25 00:44:46 2001
 @@ -6,7 +6,7 @@
  EXECS=rtest csv1test compress.test show.charnum ipacltest
  
@@ -9,3 +9,26 @@
  
  all: $(EXECS)
  
+@@ -17,17 +17,17 @@
+ 	cd libs ; make
+ 
+ rtest: rtest.c $(OBJECTS)
+-	gcc $(FLAGS) -o rtest rtest.c $(OBJECTS)
++	$(CC) $(FLAGS) -o rtest rtest.c $(OBJECTS)
+ 
+ csv1test: csv1test.c $(OBJECTS) 
+-	gcc $(FLAGS) -o csv1test csv1test.c $(OBJECTS)
++	$(CC) $(FLAGS) -o csv1test csv1test.c $(OBJECTS)
+ 
+ compress.test: compress.test.c $(OBJECTS)
+-	gcc $(FLAGS) -o compress.test compress.test.c $(OBJECTS)
++	$(CC) $(FLAGS) -o compress.test compress.test.c $(OBJECTS)
+ 
+ show.charnum: show.charnum.c 
+-	gcc $(FLAGS) -o show.charnum show.charnum.c 
++	$(CC) $(FLAGS) -o show.charnum show.charnum.c 
+ 
+ ipacltest: ipacltest.c $(OBJECTS)
+-	gcc $(FLAGS) -o ipacltest ipacltest.c $(OBJECTS)
++	$(CC) $(FLAGS) -o ipacltest ipacltest.c $(OBJECTS)
+ 
diff --git a/dns/maradns/files/patch-tools-Makefile b/dns/maradns/files/patch-tools-Makefile
index 8d4e627..776b9a2 100644
--- a/dns/maradns/files/patch-tools-Makefile
+++ b/dns/maradns/files/patch-tools-Makefile
@@ -1,5 +1,5 @@
---- tools/Makefile.old	Sat May 26 19:36:24 2001
-+++ tools/Makefile	Sat May 26 19:36:29 2001
+--- tools/Makefile.orig	Wed Jun 20 19:33:25 2001
++++ tools/Makefile	Mon Jun 25 00:45:15 2001
 @@ -5,7 +5,7 @@
  EXECS=askmara strip.control benchmark
  
@@ -9,3 +9,18 @@
  
  all: $(EXECS)
  
+@@ -13,11 +13,11 @@
+ 	rm -f $(OBJECTS) core $(EXECS)
+ 
+ askmara: askmara.c askmara_labels_en.h $(OBJECTS) 
+-	gcc $(FLAGS) -o askmara askmara.c $(OBJECTS)
++	$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS)
+ 
+ benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) 
+-	gcc $(FLAGS) -o benchmark benchmark.c $(OBJECTS)
++	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS)
+ 
+ strip.control: strip.control.c
+-	gcc $(FLAGS) -o strip.control strip.control.c
++	$(CC) $(FLAGS) -o strip.control strip.control.c
+ 
diff --git a/dns/maradns/files/patch-tuzona-Makefile b/dns/maradns/files/patch-tuzona-Makefile
index e39dd18..67150c3 100644
--- a/dns/maradns/files/patch-tuzona-Makefile
+++ b/dns/maradns/files/patch-tuzona-Makefile
@@ -1,11 +1,22 @@
---- tuzona/Makefile.old	Sat May 26 19:37:30 2001
-+++ tuzona/Makefile	Sat May 26 19:37:35 2001
-@@ -6,7 +6,7 @@
+--- tuzona/Makefile.old	Mon Jun 25 00:51:03 2001
++++ tuzona/Makefile	Mon Jun 25 00:51:22 2001
+@@ -5,7 +5,7 @@
+ OBJECTS=$(JOBJS) $(MJOBJS) $(DOBJECTS) $(POBJECTS)
  EXECS=getzone zoneserver
  
- #FLAGS = -O2
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
+-FLAGS = -O2
++FLAGS = $(CFLAGS)
+ #FLAGS = -g
  
  all: $(EXECS)
+@@ -14,8 +14,8 @@
+ 	rm -f $(OBJECTS) core $(EXECS)
+ 
+ getzone: getzone.c $(OBJECTS) 
+-	gcc $(FLAGS) -o getzone getzone.c $(OBJECTS)
++	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
+ 
+ zoneserver: zoneserver.c $(OBJECTS)
+-	gcc $(FLAGS) -o zoneserver zoneserver.c $(OBJECTS)
++	$(CC) $(FLAGS) -o zoneserver zoneserver.c $(OBJECTS)
  
diff --git a/dns/maradns/files/patch-utf8-Makefile b/dns/maradns/files/patch-utf8-Makefile
index 367b07f..eceeaba 100644
--- a/dns/maradns/files/patch-utf8-Makefile
+++ b/dns/maradns/files/patch-utf8-Makefile
@@ -1,5 +1,5 @@
---- utf8/Makefile.old	Sat May 26 19:36:51 2001
-+++ utf8/Makefile	Sat May 26 19:36:58 2001
+--- utf8/Makefile.orig	Wed Jun 20 19:33:48 2001
++++ utf8/Makefile	Mon Jun 25 00:46:08 2001
 @@ -5,7 +5,7 @@
  EXECS=utf8test
  
@@ -9,3 +9,14 @@
  
  all: $(EXECS)
  
+@@ -13,8 +13,8 @@
+ 	rm -f $(OBJECTS) core $(EXECS)
+ 
+ Utf8.o: Utf8.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
+-	gcc -c $(FLAGS) -o Utf8.o Utf8.c 
++	$(CC) -c $(FLAGS) -o Utf8.o Utf8.c 
+ 
+ utf8test: utf8test.c $(OBJECTS) 
+-	gcc $(FLAGS) -o utf8test utf8test.c $(OBJECTS) 
++	$(CC) $(FLAGS) -o utf8test utf8test.c $(OBJECTS) 
+