From eb9b9f1c436c7971d547c8e7032e12fbf21871b6 Mon Sep 17 00:00:00 2001 From: cheusov Date: Tue, 28 Feb 2012 21:55:27 +0000 Subject: Update to 2.0.05 by package maintainer + my fixes. maradns-2.0.05: This is a stable release of MaraDNS. * Security bugfix for CVE-2011-5056 * Deadwood updated to Deadwood 3.2.01 * Nicholas Bamber's Makefile.freebsd file added. (2012.02.12) maradns-1.4.10: The hash compression function has better collision resistance. More details at http://bam2.vk.tj (2012.01.13) maradns-1.4.09: Hotfix: The hash randomization now has 31 bits of entropy, and the hash does a fairly good job of choosing a random hash bucket again. More details at http://al72.vk.tj (2011.12.30) maradns-1.4.08: Security hotfix: Hash randomization added to MaraDNS 1's recursive resolver. MaraDNS 2 is not impacted (it's been using a randomized hash since 2007). More details at http://al62.vk.tj (2011.12.29) maradns-1.4.07: This is a legacy release of MaraDNS. All patches are backports of MaraDNS 2.0 bug fixes. * A typo fix for fetchzone * AXFR-over-UDP packets are now correctly marked "truncated" * It is now possible to have the '/' in hostnames * Fix for Debian bug #607739: Hostname shown when complaining about DDIP issues * AngelD's issue with zone transfers when there are a lot of FQDN4 records fixed. * Karim's issue with '/read' directive fixed (2011.11.11) --- net/maradns/Makefile | 10 ++++++---- net/maradns/PLIST | 9 ++++++--- net/maradns/distinfo | 24 +++++++++++------------- net/maradns/options.mk | 11 +++++++++++ net/maradns/patches/patch-aa | 21 +++++++++++++++------ net/maradns/patches/patch-ab | 6 +++--- net/maradns/patches/patch-ac | 25 ++++--------------------- net/maradns/patches/patch-ad | 10 +++++----- net/maradns/patches/patch-ae | 34 +++++++++++++++++----------------- net/maradns/patches/patch-ai | 23 ----------------------- net/maradns/patches/patch-aj | 27 --------------------------- net/maradns/patches/patch-ak | 19 ------------------- net/maradns/patches/patch-al | 39 --------------------------------------- net/maradns/patches/patch-am | 13 +++++++++++++ net/maradns/patches/patch-an | 13 +++++++++++++ 15 files changed, 104 insertions(+), 180 deletions(-) create mode 100644 net/maradns/options.mk delete mode 100644 net/maradns/patches/patch-ai delete mode 100644 net/maradns/patches/patch-aj delete mode 100644 net/maradns/patches/patch-ak delete mode 100644 net/maradns/patches/patch-al create mode 100644 net/maradns/patches/patch-am create mode 100644 net/maradns/patches/patch-an (limited to 'net/maradns') diff --git a/net/maradns/Makefile b/net/maradns/Makefile index e1380151a8f..20a95388622 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2012/02/20 14:08:07 cheusov Exp $ +# $NetBSD: Makefile,v 1.25 2012/02/28 21:55:27 cheusov Exp $ -DISTNAME= maradns-1.4.06 +DISTNAME= maradns-2.0.05 CATEGORIES= net -MASTER_SITES= http://www.maradns.org/download/1.4/${PKGVERSION_NOREV}/ +MASTER_SITES= http://www.maradns.org/download/2.0/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= ddeus.pkgsrc@mailnull.com @@ -27,7 +27,9 @@ LDFLAGS+= ${PTHREAD_LIBS} SUBST_CLASSES+= sysconf SUBST_STAGE.sysconf= pre-configure SUBST_VARS.sysconf= PKG_SYSCONFDIR -SUBST_FILES.sysconf= parse/ParseMaraRc.c +SUBST_FILES.sysconf= parse/ParseMaraRc.c MaraDns.h deadwood-3.2.01/src/DwMain.c + +.include "options.mk" post-install: cd ${DESTDIR}${PREFIX}/share/doc/maradns && ${MV} examples ../../examples/maradns diff --git a/net/maradns/PLIST b/net/maradns/PLIST index a6c2e807a09..f692290b0a0 100644 --- a/net/maradns/PLIST +++ b/net/maradns/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.10 2010/06/25 21:40:32 joerg Exp $ +@comment $NetBSD: PLIST,v 1.11 2012/02/28 21:55:27 cheusov Exp $ bin/askmara bin/duende bin/fetchzone bin/getzone +man/man1/Deadwood.1 man/man1/askmara.1 man/man1/fetchzone.1 man/man1/getzone.1 @@ -13,6 +14,7 @@ man/man5/mararc.5 man/man8/duende.8 man/man8/maradns.8 man/man8/zoneserver.8 +sbin/Deadwood sbin/maradns sbin/zoneserver share/doc/maradns/Makefile @@ -23,6 +25,7 @@ share/doc/maradns/credits.txt share/doc/maradns/faq.html share/doc/maradns/faq.txt share/doc/maradns/files.txt +share/doc/maradns/man/Deadwood.1 share/doc/maradns/man/Makefile share/doc/maradns/man/askmara.1 share/doc/maradns/man/bind2csv2.1 @@ -179,7 +182,6 @@ share/doc/maradns/text/troubleshoot.txt share/doc/maradns/text/tutorial.txt share/doc/maradns/text/update.txt share/doc/maradns/text/win_service.txt -share/doc/maradns/tutorial/00index.html share/doc/maradns/tutorial/Makefile share/doc/maradns/tutorial/authoritative.html share/doc/maradns/tutorial/bind2csv2.html @@ -193,7 +195,6 @@ share/doc/maradns/tutorial/dnsmaster.html share/doc/maradns/tutorial/dnsslave.html share/doc/maradns/tutorial/dnstcp.html share/doc/maradns/tutorial/glossary.html -share/doc/maradns/tutorial/index.html share/doc/maradns/tutorial/make.index share/doc/maradns/tutorial/man.askmara.html share/doc/maradns/tutorial/man.csv2.html @@ -244,6 +245,8 @@ share/doc/maradns/webpage/notes.embed share/doc/maradns/webpage/notes.html share/doc/maradns/webpage/products.embed share/doc/maradns/webpage/products.html +share/doc/maradns/webpage/search.embed +share/doc/maradns/webpage/search.html share/doc/maradns/webpage/security.embed share/doc/maradns/webpage/security.html share/doc/maradns/webpage/sponsors.embed diff --git a/net/maradns/distinfo b/net/maradns/distinfo index 6cc8a9aeb50..edf386e15bf 100644 --- a/net/maradns/distinfo +++ b/net/maradns/distinfo @@ -1,14 +1,12 @@ -$NetBSD: distinfo,v 1.12 2011/05/06 11:36:23 obache Exp $ +$NetBSD: distinfo,v 1.13 2012/02/28 21:55:27 cheusov Exp $ -SHA1 (maradns-1.4.06.tar.bz2) = 7de7481512aec606b761c10f67d2da8fc808161b -RMD160 (maradns-1.4.06.tar.bz2) = 160e0d3d64a29a5ae1c8262d6d80763a68ca7b2d -Size (maradns-1.4.06.tar.bz2) = 1085986 bytes -SHA1 (patch-aa) = 701ae5efa81273285fef83ec14b02476cb8ed36a -SHA1 (patch-ab) = c3b5d86477f0d61434e7b6bed7859fa36741504e -SHA1 (patch-ac) = 1031b4bb51f65a5cd8ca9a06ffced2ac3571873d -SHA1 (patch-ad) = c67b25691d0c49553e9efcafaebd1caa6e957b90 -SHA1 (patch-ae) = a2494061247cc4919227622de3758d6c5c8cfd86 -SHA1 (patch-ai) = 7bf925bef4d0b9682af9ccea8779bab686987e2d -SHA1 (patch-aj) = 1be1ad335a31d03d8def8d7bb74b7d45e814bd77 -SHA1 (patch-ak) = f7fe72709a91a74dd6ff841f7155da0bd665162e -SHA1 (patch-al) = 0c93aff699ed65cae6678587a46c41651db637e1 +SHA1 (maradns-2.0.05.tar.bz2) = 589cac7ce7451580a1a03ece6c64db3929262699 +RMD160 (maradns-2.0.05.tar.bz2) = d6540562d670c81037e7bf3305e7ddf30694d05e +Size (maradns-2.0.05.tar.bz2) = 1061283 bytes +SHA1 (patch-aa) = c1fb0e8824b1cedbb94507d83aa5d8272c937194 +SHA1 (patch-ab) = 7dff57289ca7096e5795d5af1356c81447fd0544 +SHA1 (patch-ac) = d5e3567cf721dab9574aca53111c75c975e6914d +SHA1 (patch-ad) = c64a5995253d9dc91273fc49358dbb53f451ff9d +SHA1 (patch-ae) = 46b40b72eb783bad924376ceae56eec27d9df8c6 +SHA1 (patch-am) = a7bbfa3deea2d3f63e78703ee523c8aa1d1ab56c +SHA1 (patch-an) = 83f42b522c9b47e127f6b7130d69b355db0563c6 diff --git a/net/maradns/options.mk b/net/maradns/options.mk new file mode 100644 index 00000000000..f645a1206b8 --- /dev/null +++ b/net/maradns/options.mk @@ -0,0 +1,11 @@ +# $NetBSD: options.mk,v 1.1 2012/02/28 21:55:27 cheusov Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.maradns +PKG_SUPPORTED_OPTIONS+= inet6 +PKG_SUGGESTED_OPTIONS+= inet6 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --ipv6 +.endif diff --git a/net/maradns/patches/patch-aa b/net/maradns/patches/patch-aa index a49513ec445..5b6d6d3fd2e 100644 --- a/net/maradns/patches/patch-aa +++ b/net/maradns/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/08/12 01:14:31 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2012/02/28 21:55:28 cheusov Exp $ ---- build/install.locations.orig 2007-08-12 02:02:22.000000000 +0200 +--- build/install.locations.orig 2011-02-06 02:21:31.000000000 +0000 +++ build/install.locations -@@ -23,34 +23,14 @@ if [ ! -d doc/$LANGUAGE/man ]; then +@@ -23,43 +23,14 @@ if [ ! -d doc/$LANGUAGE/man ]; then fi # The location of programs that the end user may wish to use @@ -32,14 +32,23 @@ $NetBSD: patch-aa,v 1.4 2007/08/12 01:14:31 joerg Exp $ -# If the directory that MAN1 points to does not exist -if [ ! -d $MAN1 ] ; then - # Then try this location instead -- MAN1="/usr/local/share/man/man1" +- MAN1="$PREFIX/share/man/man1" +- if [ ! -d $MAN1 ] ; then +- MAN1="/usr/local/share/man/man1" +- fi -fi -# Do the same with the MAN5 and MAN8 directories -if [ ! -d $MAN5 ] ; then -- MAN5="/usr/local/share/man/man5" +- MAN5="$PREFIX/share/man/man5" +- if [ ! -d $MAN5 ] ; then +- MAN5="/usr/local/share/man/man5" +- fi -fi -if [ ! -d $MAN8 ] ; then -- MAN8="/usr/local/share/man/man8" +- MAN8="$PREFIX/share/man/man8" +- if [ ! -d $MAN8 ] ; then +- MAN8="/usr/local/share/man/man8" +- fi -fi - +DOCS="${DESTDIR}$PREFIX/share/doc/maradns" diff --git a/net/maradns/patches/patch-ab b/net/maradns/patches/patch-ab index 9994cadc711..be3ac2b1c6c 100644 --- a/net/maradns/patches/patch-ab +++ b/net/maradns/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2007/08/12 01:14:31 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2012/02/28 21:55:28 cheusov Exp $ ---- build/install.sh.orig 2007-08-12 02:07:37.000000000 +0200 +--- build/install.sh.orig 2011-08-05 11:59:45.000000000 +0000 +++ build/install.sh -@@ -136,6 +136,8 @@ else +@@ -157,6 +157,8 @@ else cd doc/en/examples fi diff --git a/net/maradns/patches/patch-ac b/net/maradns/patches/patch-ac index 8ebb8f9c7e6..c3b24770ca8 100644 --- a/net/maradns/patches/patch-ac +++ b/net/maradns/patches/patch-ac @@ -1,25 +1,8 @@ -$NetBSD: patch-ac,v 1.3 2010/05/23 17:30:31 schwarz Exp $ +$NetBSD: patch-ac,v 1.4 2012/02/28 21:55:28 cheusov Exp $ ---- 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 @@ +--- configure.orig 2011-08-05 11:59:45.000000000 +0000 ++++ configure +@@ -125,7 +125,7 @@ else 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 --git a/net/maradns/patches/patch-ad b/net/maradns/patches/patch-ad index 9b01a4ecb65..c4eaa5f6296 100644 --- a/net/maradns/patches/patch-ad +++ b/net/maradns/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.4 2011/05/06 11:36:24 obache Exp $ +$NetBSD: patch-ad,v 1.5 2012/02/28 21:55:28 cheusov Exp $ ---- 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 @@ +--- parse/ParseMaraRc.c.orig 2012-02-12 06:04:12.000000000 +0000 ++++ parse/ParseMaraRc.c +@@ -1037,7 +1037,7 @@ int find_mararc(js_string *out) { return JS_ERROR; /* Simple and secure: We look for it in /etc/mararc */ - return js_qstr2js(out,"/etc/mararc"); -+ return js_qstr2js(out,"@PKG_SYSCONFDIR@/mararc"); ++ return js_qstr2js(out,"@PKG_SYSCONFDIR@/maradns/mararc"); } diff --git a/net/maradns/patches/patch-ae b/net/maradns/patches/patch-ae index f8de34b92bd..6ea04e63b7a 100644 --- a/net/maradns/patches/patch-ae +++ b/net/maradns/patches/patch-ae @@ -1,35 +1,35 @@ -$NetBSD: patch-ae,v 1.3 2010/05/23 17:30:31 schwarz Exp $ +$NetBSD: patch-ae,v 1.4 2012/02/28 21:55:28 cheusov Exp $ ---- 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 @@ +--- server/Makefile.orig 2010-09-09 20:21:09.000000000 +0000 ++++ server/Makefile +@@ -24,23 +24,23 @@ libs/tests: 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) -c $(FLAGS) $(CFLAGS) -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 ++ $(CC) -c $(FLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.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 ++ $(CC) -c $(FLAGS) $(CFLAGS) -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 ++ $(CC) -c $(FLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c + + udpsuccess.o: udpsuccess.c +- $(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c ++ $(CC) -c $(FLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.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) +- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) ++ $(CC) $(FLAGS) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) $(LDADD) - 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 + simple: MaraDNS.c $(OBJECTS) MaraDNS_locale.h +- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple simple.c $(OBJECTS) ++ $(CC) $(FLAGS) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple simple.c $(OBJECTS) $(LDADD) diff --git a/net/maradns/patches/patch-ai b/net/maradns/patches/patch-ai deleted file mode 100644 index 4465a7a13b8..00000000000 --- a/net/maradns/patches/patch-ai +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2007/08/12 01:14:31 joerg Exp $ - ---- dns/Makefile.recursive.orig 2007-08-12 00:46:35.000000000 +0000 -+++ dns/Makefile.recursive -@@ -12,14 +12,14 @@ clean: - rm -f Queries.o Compress.o bobbit.o Decompress.o - - Queries.o: Queries.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Queries.o Queries.c -+ $(CC) ${CFLAGS} -c $(FLAGS) -o Queries.o Queries.c - - Compress.o: Compress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Compress.o Compress.c -+ $(CC) ${CFLAGS} -c $(FLAGS) -o Compress.o Compress.c - - Decompress.o: Decompress.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o Decompress.o Decompress.c -+ $(CC) ${CFLAGS} -c $(FLAGS) -o Decompress.o Decompress.c - - bobbit.o: bobbit.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h -- $(CC) -c $(FLAGS) -o bobbit.o bobbit.c -+ $(CC) ${CFLAGS} -c $(FLAGS) -o bobbit.o bobbit.c - diff --git a/net/maradns/patches/patch-aj b/net/maradns/patches/patch-aj deleted file mode 100644 index 29ba0e604d1..00000000000 --- a/net/maradns/patches/patch-aj +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2010/05/23 17:30:31 schwarz Exp $ - ---- 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) -- $(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) -+ $(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) - - askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS) -- $(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) -+ $(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) - - benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS) -- $(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS) -+ $(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS) - - duende: duende.c -- $(CC) $(FLAGS) -o duende duende.c -+ $(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o duende duende.c - - strip.control: strip.control.c -- $(CC) $(FLAGS) -o strip.control strip.control.c -+ $(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o strip.control strip.control.c - diff --git a/net/maradns/patches/patch-ak b/net/maradns/patches/patch-ak deleted file mode 100644 index 0b17d90f7d0..00000000000 --- a/net/maradns/patches/patch-ak +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2007/08/12 01:14:31 joerg Exp $ - ---- tcp/Makefile.recursive.orig 2006-07-18 03:50:44.000000000 +0000 -+++ tcp/Makefile.recursive -@@ -26,11 +26,11 @@ clean: - rm -f core $(EXECS) $(TCPOBJS) *.exe - - getzone: getzone.c $(OBJECTS) -- $(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS) -+ $(CC) ${LDFLAGS} ${LDFLAGS} $(FLAGS) -o getzone getzone.c $(OBJECTS) - - fetchzone: fetchzone.c $(OBJECTS) -- $(CC) $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) -+ $(CC) ${LDFLAGS} ${LDFLAGS} $(FLAGS) -o fetchzone fetchzone.c $(OBJECTS) - - zoneserver: zoneserver.c zoneserver_en.h $(OBJECTS) -- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS) -+ $(CC) ${LDFLAGS} ${LDFLAGS} $(FLAGS) -DVERSION=\"$(VERSION)\" -o zoneserver zoneserver.c $(OBJECTS) $(RNGOBJS) - diff --git a/net/maradns/patches/patch-al b/net/maradns/patches/patch-al deleted file mode 100644 index 0fe5ee613df..00000000000 --- a/net/maradns/patches/patch-al +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-al,v 1.2 2010/05/23 17:30:31 schwarz Exp $ - ---- 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 - - 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 - - udpsuccess.o: udpsuccess.c -- $(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c -+ $(CC) $(CFLAGS) -c $(FLAGS) -o udpsuccess.o udpsuccess.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 --git a/net/maradns/patches/patch-am b/net/maradns/patches/patch-am new file mode 100644 index 00000000000..901de5c152b --- /dev/null +++ b/net/maradns/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.3 2012/02/28 21:55:28 cheusov Exp $ + +--- MaraDns.h.orig 2012-02-14 14:06:44.000000000 +0100 ++++ MaraDns.h 2012-02-14 14:09:52.000000000 +0100 +@@ -91,7 +91,7 @@ + /* The directory that Duende runs in. This directory has to exist for + Duende to be able to run. Again, IF YOU CHANGE THIS, CHANGE THE + DUENDE MAN PAGE */ +-#define DUENDE_CHROOT_DIR "/etc/maradns/logger" ++#define DUENDE_CHROOT_DIR "@PKG_SYSCONFDIR@/maradns/logger" + + /* The default IP address that Askmara uses; this used to be 127.0.0.3 + but is now 127.0.0.1 because many non-Linux systems only use 127.0.0.1 diff --git a/net/maradns/patches/patch-an b/net/maradns/patches/patch-an new file mode 100644 index 00000000000..241dbb236dd --- /dev/null +++ b/net/maradns/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2012/02/28 21:55:28 cheusov Exp $ + +--- deadwood-3.2.01/src/DwMain.c.orig 2012-02-14 14:13:11.000000000 +0000 ++++ deadwood-3.2.01/src/DwMain.c 2012-02-14 14:14:13.000000000 +0000 +@@ -66,7 +66,7 @@ + process_mararc(argv[2]); + } else { + #ifndef MINGW +- process_mararc("/etc/dwood3rc"); ++ process_mararc("@PKG_SYSCONFDIR@/maradns/dwood3rc"); + #else /* MINGW */ + process_mararc("dwood3rc.txt"); + #endif /* MINGW */ -- cgit v1.2.3