pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/maradns updated to 1.4.03



details:   https://anonhg.NetBSD.org/pkgsrc/rev/516b5fbeba16
branches:  trunk
changeset: 575811:516b5fbeba16
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sun May 23 17:30:31 2010 +0000

description:
updated to 1.4.03
patched to support Darwin

diffstat:

 net/maradns/Makefile         |   9 ++++---
 net/maradns/PLIST            |  35 ++------------------------------
 net/maradns/distinfo         |  19 ++++++++---------
 net/maradns/patches/patch-ac |  25 ++++++++++++++++++++---
 net/maradns/patches/patch-ad |   8 +++---
 net/maradns/patches/patch-ae |  46 ++++++++++++++++++++++++++++++++-----------
 net/maradns/patches/patch-aj |   8 +++---
 net/maradns/patches/patch-al |  26 ++++++++++++++----------
 net/maradns/patches/patch-am |  34 --------------------------------
 9 files changed, 95 insertions(+), 115 deletions(-)

diffs (truncated from 362 to 300 lines):

diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/Makefile
--- a/net/maradns/Makefile      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/Makefile      Sun May 23 17:30:31 2010 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.20 2008/03/19 22:55:21 tonnerre Exp $
+# $NetBSD: Makefile,v 1.21 2010/05/23 17:30:31 schwarz Exp $
 
-DISTNAME=      maradns-1.2.12.06
-PKGREVISION=   1
+DISTNAME=      maradns-1.4.03
 CATEGORIES=    net
-MASTER_SITES=  http://www.maradns.org/download/1.2/${DISTNAME:S/maradns-//}/
+MASTER_SITES=  http://www.maradns.org/download/1.4/${DISTNAME:S/maradns-//}/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.maradns.org/
 COMMENT=       Secure DNS server for *NIX systems
 
+USE_TOOLS+=    awk:build
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 HAS_CONFIGURE=         yes
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/PLIST
--- a/net/maradns/PLIST Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/PLIST Sun May 23 17:30:31 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:00:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/05/23 17:30:31 schwarz Exp $
 bin/askmara
 bin/duende
 bin/fetchzone
@@ -18,15 +18,15 @@
 share/doc/maradns/Makefile
 share/doc/maradns/QuickStart
 share/doc/maradns/README
-share/doc/maradns/changelog.html
 share/doc/maradns/changelog.txt
 share/doc/maradns/credits.txt
-share/doc/maradns/download.html
 share/doc/maradns/faq.html
 share/doc/maradns/faq.txt
 share/doc/maradns/files.txt
+share/doc/maradns/maradns.gpg.key
 share/doc/maradns/man/Makefile
 share/doc/maradns/man/askmara.1
+share/doc/maradns/man/bind2csv2.1
 share/doc/maradns/man/csv1.5
 share/doc/maradns/man/csv2.5
 share/doc/maradns/man/csv2_txt.5
@@ -39,24 +39,9 @@
 share/doc/maradns/man/mqhash.1
 share/doc/maradns/man/read.manpage
 share/doc/maradns/man/zoneserver.8
-share/doc/maradns/maradns.gpg.key
 share/doc/maradns/misc/0README
-share/doc/maradns/misc/RFC1035.compliance
-share/doc/maradns/misc/advocacy/active.other
-share/doc/maradns/misc/advocacy/bind9
-share/doc/maradns/misc/advocacy/djbdns
-share/doc/maradns/misc/advocacy/inactive
-share/doc/maradns/misc/bind2csv2.design
-share/doc/maradns/misc/cache.poison.protection
-share/doc/maradns/misc/compression/decompress_api.abw
-share/doc/maradns/misc/compression/decompress_api.html
-share/doc/maradns/misc/compression/describing_dns_rrs.html
-share/doc/maradns/misc/compression/handling.compression
-share/doc/maradns/misc/csv2-1.4-ideas/csv2.brace.processing
 share/doc/maradns/misc/csv2.regexmatch.functionlist
 share/doc/maradns/misc/dns-record-types.txt
-share/doc/maradns/misc/how.maradns.stores.rrs
-share/doc/maradns/misc/how.to.support.sql
 share/doc/maradns/misc/js-manpages/README
 share/doc/maradns/misc/js-manpages/js_alloc.3
 share/doc/maradns/misc/js-manpages/js_append.3
@@ -102,24 +87,14 @@
 share/doc/maradns/misc/js-manpages/js_unlock.3
 share/doc/maradns/misc/js-manpages/js_val.3
 share/doc/maradns/misc/js-manpages/js_write.3
-share/doc/maradns/misc/man_macros/README
-share/doc/maradns/misc/man_macros/example_manpage.1
-share/doc/maradns/misc/man_macros/man.macros
-share/doc/maradns/misc/man_macros/man.macros.7
 share/doc/maradns/misc/multiple.qdcount
-share/doc/maradns/misc/private_rrs.abw
-share/doc/maradns/misc/private_rrs.html
 share/doc/maradns/misc/propagation.txt
-share/doc/maradns/misc/recursive-case-insensitive
 share/doc/maradns/misc/recursive.algorithm
-share/doc/maradns/misc/resolution.algorithm
-share/doc/maradns/misc/rfc1034.notes.abw
 share/doc/maradns/misc/setup.bind.djbdns.axfr.test
 share/doc/maradns/misc/vim.cheatsheet
 share/doc/maradns/misc/year_2038_statement.txt
 share/doc/maradns/pdf/Makefile
 share/doc/maradns/pdf/README
-share/doc/maradns/pdf/manpage_reference.pdf
 share/doc/maradns/pdf/tmac.an.patch
 share/doc/maradns/source/SOURCE.FILES
 share/doc/maradns/source/askmara.ej
@@ -133,7 +108,6 @@
 share/doc/maradns/source/credits.embed
 share/doc/maradns/source/csv1.ej
 share/doc/maradns/source/csv2.ej
-share/doc/maradns/source/csv2.ej.orig
 share/doc/maradns/source/csv2_txt.ej
 share/doc/maradns/source/dangling.ej
 share/doc/maradns/source/data_structures.ej
@@ -163,7 +137,6 @@
 share/doc/maradns/source/maraconf.ej
 share/doc/maradns/source/maradns.ej
 share/doc/maradns/source/mararc.ej
-share/doc/maradns/source/mararc.ej.orig
 share/doc/maradns/source/mqhash.ej
 share/doc/maradns/source/old.changelog
 share/doc/maradns/source/quick_start.ej
@@ -254,8 +227,6 @@
 share/doc/maradns/webpage/maradns-1.2-top.html
 share/doc/maradns/webpage/notes.embed
 share/doc/maradns/webpage/notes.html
-share/doc/maradns/webpage/roadmap.embed
-share/doc/maradns/webpage/roadmap.html
 share/doc/maradns/webpage/security.embed
 share/doc/maradns/webpage/security.html
 share/examples/maradns/Makefile
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/distinfo
--- a/net/maradns/distinfo      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/distinfo      Sun May 23 17:30:31 2010 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.10 2008/03/19 22:55:21 tonnerre Exp $
+$NetBSD: distinfo,v 1.11 2010/05/23 17:30:31 schwarz Exp $
 
-SHA1 (maradns-1.2.12.06.tar.bz2) = bb94f2bcb612fe6c8f47ef6721051a57840a386e
-RMD160 (maradns-1.2.12.06.tar.bz2) = 8c88fd87bff54c0121348e19a5255869622228a6
-Size (maradns-1.2.12.06.tar.bz2) = 1074582 bytes
+SHA1 (maradns-1.4.03.tar.bz2) = 3ffd296d6d6ee25206e44f08b6d9bd4845369d81
+RMD160 (maradns-1.4.03.tar.bz2) = 3c910e45b0d2ddcb8a879141ace51fffd7f95d50
+Size (maradns-1.4.03.tar.bz2) = 987147 bytes
 SHA1 (patch-aa) = 701ae5efa81273285fef83ec14b02476cb8ed36a
 SHA1 (patch-ab) = c3b5d86477f0d61434e7b6bed7859fa36741504e
-SHA1 (patch-ac) = 37176edca29f35cbf6d6a7818828e740dd19439e
-SHA1 (patch-ad) = fe7aefd106f448665d6dd30580bb8a967347dc25
-SHA1 (patch-ae) = 835704a37a2fc0959de5aaaa4bf7ec57bb1482e2
+SHA1 (patch-ac) = 1031b4bb51f65a5cd8ca9a06ffced2ac3571873d
+SHA1 (patch-ad) = 1676c9d144fdca85163d40e3f27aebf8087e9e64
+SHA1 (patch-ae) = a2494061247cc4919227622de3758d6c5c8cfd86
 SHA1 (patch-ai) = 7bf925bef4d0b9682af9ccea8779bab686987e2d
-SHA1 (patch-aj) = b8c98de240712dad2f396e25bee6b6564a0a6e5e
+SHA1 (patch-aj) = 1be1ad335a31d03d8def8d7bb74b7d45e814bd77
 SHA1 (patch-ak) = f7fe72709a91a74dd6ff841f7155da0bd665162e
-SHA1 (patch-al) = 72faa0c34b44fffb49a079e958816692f6c90c5f
-SHA1 (patch-am) = 725e408c7d395d65fe4adc0d3d7e018c2c6a6c17
+SHA1 (patch-al) = 0c93aff699ed65cae6678587a46c41651db637e1
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/patches/patch-ac
--- a/net/maradns/patches/patch-ac      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/patches/patch-ac      Sun May 23 17:30:31 2010 +0000
@@ -1,8 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2007/08/12 01:14:31 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2010/05/23 17:30:31 schwarz Exp $
 
---- configure.orig     2007-08-12 02:10:48.000000000 +0200
-+++ configure
-@@ -150,7 +150,7 @@ else
+--- configure.orig     2010-05-23 18:50:50.000000000 +0200
++++ configure  2010-05-23 18:52:29.000000000 +0200
+@@ -112,14 +112,14 @@
+       EXITCODE=0
+ elif echo $UNAME | grep -i darwin > /dev/null ; then
+       cat $BUILDDIR/Makefile.darwin >> Makefile
+-      cp $BUILDDIR/install.darwin $BUILDDIR/install.locations
++      #cp $BUILDDIR/install.darwin $BUILDDIR/install.locations
+       echo It looks like you are using Darwin \(usually\; Mac OS X\)\;
+       #echo This should compile fine by typing in \'make\'.
+       echo You might be able to compile MaraDNS by typing \"make\"
+       echo \(if you typed in \"make\" before, just type it again\)
+       echo
+       echo THIS PORT HAS NOT BEEN FULLY TESTED\; USE AT YOUR OWN RISK
+-      EXITCODE=1
++      EXITCODE=0
+ # This is a a template for adding support to a new OS for MaraDNS.
+ # Some points: If you port MaraDNS, make sure the underlying OS has
+ # /dev/urandom support or have the default mararc have a
+@@ -155,7 +155,7 @@
        echo \(if you typed in \"make\" before, just type it again\)
        echo
        echo THIS PORT HAS NOT BEEN TESTED\; USE AT YOUR OWN RISK
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/patches/patch-ad
--- a/net/maradns/patches/patch-ad      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/patches/patch-ad      Sun May 23 17:30:31 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2006/12/13 04:35:16 obache Exp $
+$NetBSD: patch-ad,v 1.3 2010/05/23 17:30:31 schwarz Exp $
 
---- parse/ParseMaraRc.c.orig   2005-07-01 06:20:35.000000000 +0000
-+++ parse/ParseMaraRc.c
-@@ -823,7 +823,7 @@ int find_mararc(js_string *out) {
+--- parse/ParseMaraRc.c.orig   2010-05-23 17:51:12.000000000 +0200
++++ parse/ParseMaraRc.c        2010-05-23 17:51:18.000000000 +0200
+@@ -1037,7 +1037,7 @@
          return JS_ERROR;
  
      /* Simple and secure: We look for it in /etc/mararc */
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/patches/patch-ae
--- a/net/maradns/patches/patch-ae      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/patches/patch-ae      Sun May 23 17:30:31 2010 +0000
@@ -1,13 +1,35 @@
-$NetBSD: patch-ae,v 1.2 2007/08/12 01:14:31 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2010/05/23 17:30:31 schwarz Exp $
 
---- tcp/zoneserver.c.orig      2007-08-12 00:49:01.000000000 +0000
-+++ tcp/zoneserver.c
-@@ -34,7 +34,7 @@
- #include <errno.h>
- #include <string.h>
- #include <time.h>
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/time.h>
- #endif
- #include <sys/types.h>
+--- server/Makefile.orig       2010-05-23 18:33:42.000000000 +0200
++++ server/Makefile    2010-05-23 18:33:52.000000000 +0200
+@@ -32,23 +32,23 @@
+       cd libs ; make
+ 
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-      $(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++      $(CC) $(CFLAGS) -c $(FLAGS) -o read_kvars.o read_kvars.c
+ 
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+-      $(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++      $(CC) $(CFLAGS) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
+ 
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+-      $(CC) -c $(FLAGS) -o recursive.o recursive.c 
++      $(CC) $(CFLAGS) -c $(FLAGS) -o recursive.o recursive.c 
+ 
+ timestamp.o: timestamp.c MaraDNS_locale.h
+-      $(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++      $(CC) $(CFLAGS) -c $(FLAGS) -o timestamp.o timestamp.c
+ 
+ MaraAnyChain.o: MaraAnyChain.c
+-      $(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++      $(CC) $(CFLAGS) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
+ 
+ maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
+-      $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++      $(CC) $(LDFLAGS) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS)
+ 
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+-      $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
++      $(CC) $(CFLAGS) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c 
+ 
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/patches/patch-aj
--- a/net/maradns/patches/patch-aj      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/patches/patch-aj      Sun May 23 17:30:31 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/08/12 01:14:31 joerg Exp $
+$NetBSD: patch-aj,v 1.3 2010/05/23 17:30:31 schwarz Exp $
 
---- tools/Makefile.orig        2006-01-02 16:59:33.000000000 +0000
-+++ tools/Makefile
-@@ -18,17 +18,17 @@ clean:
+--- tools/Makefile.recursive.orig      2010-05-23 18:09:37.000000000 +0200
++++ tools/Makefile.recursive   2010-05-23 18:11:17.000000000 +0200
+@@ -18,17 +18,17 @@
        rm -f core $(EXECS) *.exe
  
  askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
diff -r 99d8eec1da45 -r 516b5fbeba16 net/maradns/patches/patch-al
--- a/net/maradns/patches/patch-al      Sun May 23 17:30:12 2010 +0000
+++ b/net/maradns/patches/patch-al      Sun May 23 17:30:31 2010 +0000
@@ -1,35 +1,39 @@
-$NetBSD: patch-al,v 1.1 2007/08/12 01:14:31 joerg Exp $
+$NetBSD: patch-al,v 1.2 2010/05/23 17:30:31 schwarz Exp $
 
---- server/Makefile.recursive.orig     2006-07-18 03:50:44.000000000 +0000
-+++ server/Makefile.recursive
-@@ -33,23 +33,23 @@ libs/tests:
+--- server/Makefile.recursive.orig     2007-08-16 15:35:43.000000000 +0200
++++ server/Makefile.recursive  2010-05-23 18:16:34.000000000 +0200
+@@ -34,26 +34,26 @@
        cd libs ; make
  
  read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
 -      $(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
-+      $(CC) ${CFLAGS} -c $(FLAGS) -o read_kvars.o read_kvars.c
++      $(CC) $(CFLAGS) -c $(FLAGS) -o read_kvars.o read_kvars.c
  
  MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
 -      $(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
-+      $(CC) ${CFLAGS} -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
++      $(CC) $(CFLAGS) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
  
  recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
 -      $(CC) -c $(FLAGS) -o recursive.o recursive.c 
-+      $(CC) ${CFLAGS} -c $(FLAGS) -o recursive.o recursive.c 
++      $(CC) $(CFLAGS) -c $(FLAGS) -o recursive.o recursive.c 
  



Home | Main Index | Thread Index | Old Index