diff options
author | joerg <joerg> | 2007-08-12 01:14:30 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-08-12 01:14:30 +0000 |
commit | 57caff840c3187395690e2a3b125435ec41b96e0 (patch) | |
tree | 2b45b128908549ec333474c26e7acd367e5cf73a /net/maradns | |
parent | 3a2139054b7e318fb7922465a02dd04a4a0013b9 (diff) | |
download | pkgsrc-57caff840c3187395690e2a3b125435ec41b96e0.tar.gz |
Update to maradns-1.2.12.06.
Most important changes:
- full Y2038 compliance
- full support for DNS over TCP
- some changes in the zone format.
Diffstat (limited to 'net/maradns')
-rw-r--r-- | net/maradns/Makefile | 20 | ||||
-rw-r--r-- | net/maradns/PLIST | 168 | ||||
-rw-r--r-- | net/maradns/distinfo | 26 | ||||
-rw-r--r-- | net/maradns/patches/patch-aa | 61 | ||||
-rw-r--r-- | net/maradns/patches/patch-ab | 25 | ||||
-rw-r--r-- | net/maradns/patches/patch-ac | 22 | ||||
-rw-r--r-- | net/maradns/patches/patch-ae | 24 | ||||
-rw-r--r-- | net/maradns/patches/patch-ai | 30 | ||||
-rw-r--r-- | net/maradns/patches/patch-aj | 43 | ||||
-rw-r--r-- | net/maradns/patches/patch-ak | 30 | ||||
-rw-r--r-- | net/maradns/patches/patch-al | 35 |
11 files changed, 328 insertions, 156 deletions
diff --git a/net/maradns/Makefile b/net/maradns/Makefile index fef512781d9..0c65f2edde8 100644 --- a/net/maradns/Makefile +++ b/net/maradns/Makefile @@ -1,24 +1,23 @@ -# $NetBSD: Makefile,v 1.18 2007/03/24 19:21:29 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2007/08/12 01:14:30 joerg Exp $ -DISTNAME= maradns-1.0.39 +DISTNAME= maradns-1.2.12.06 CATEGORIES= net -MASTER_SITES= http://www.maradns.org/download/1.0/ +MASTER_SITES= http://www.maradns.org/download/1.2/${DISTNAME:S/maradns-//}/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.maradns.org/ COMMENT= Secure DNS server for *NIX systems +PKG_DESTDIR_SUPPORT= user-destdir + HAS_CONFIGURE= yes PTHREAD_OPTS+= require PTHREAD_AUTO_VARS= yes -MAKE_ENV+= LANGUAGE="en" - -EGDIR= ${PREFIX}/share/examples/maradns -CONF_FILES= ${EGDIR}/example_mararc ${PKG_SYSCONFDIR}/mararc +MAKE_ENV+= LANGUAGE="en" PKGMANDIR=${PKGMANDIR:Q} -INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ - share/examples +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ + ${PKGMANDIR}/man8 sbin share/examples .include "../../mk/pthread.buildlink3.mk" LDFLAGS+= ${PTHREAD_LIBS} @@ -29,7 +28,6 @@ post-patch: @${MV} ${WRKSRC}/parse/ParseMaraRc.sed ${WRKSRC}/parse/ParseMaraRc.c post-install: - @${MV} ${PREFIX}/share/doc/maradns/examples \ - ${PREFIX}/share/examples/maradns + cd ${DESTDIR}${PREFIX}/share/doc/maradns && ${MV} examples ../../examples/maradns .include "../../mk/bsd.pkg.mk" diff --git a/net/maradns/PLIST b/net/maradns/PLIST index 6a6af6ae55f..17a8520744e 100644 --- a/net/maradns/PLIST +++ b/net/maradns/PLIST @@ -1,10 +1,16 @@ -@comment $NetBSD: PLIST,v 1.5 2006/12/13 04:35:16 obache Exp $ +@comment $NetBSD: PLIST,v 1.6 2007/08/12 01:14:30 joerg Exp $ bin/askmara +bin/duende +bin/fetchzone bin/getzone man/man1/askmara.1 +man/man1/fetchzone.1 man/man1/getzone.1 man/man5/csv1.5 +man/man5/csv2.5 +man/man5/csv2_txt.5 man/man5/mararc.5 +man/man8/duende.8 man/man8/maradns.8 man/man8/zoneserver.8 sbin/maradns @@ -15,32 +21,40 @@ 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/logfile share/doc/maradns/man/Makefile share/doc/maradns/man/askmara.1 share/doc/maradns/man/csv1.5 +share/doc/maradns/man/csv2.5 +share/doc/maradns/man/csv2_txt.5 +share/doc/maradns/man/duende.8 +share/doc/maradns/man/fetchzone.1 share/doc/maradns/man/getzone.1 -share/doc/maradns/man/make.postscript +share/doc/maradns/man/make.pdf share/doc/maradns/man/maradns.8 share/doc/maradns/man/mararc.5 +share/doc/maradns/man/mqhash.1 share/doc/maradns/man/read.manpage share/doc/maradns/man/zoneserver.8 -share/doc/maradns/maradns.pgp.key +share/doc/maradns/maradns.gpg.key share/doc/maradns/misc/0README share/doc/maradns/misc/RFC1035.compliance -share/doc/maradns/misc/TODO.done -share/doc/maradns/misc/TODO.first -share/doc/maradns/misc/TODO.second -share/doc/maradns/misc/TODO.third +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/decompress_api.abw -share/doc/maradns/misc/decompress_api.html -share/doc/maradns/misc/describing_dns_rrs.abw -share/doc/maradns/misc/describing_dns_rrs.html -share/doc/maradns/misc/handling.compression +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 @@ -93,26 +107,20 @@ 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/old.changelog 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/rfc/rfc1035.txt -share/doc/maradns/misc/rtest.output -share/doc/maradns/misc/spammers/azmalink.net -share/doc/maradns/misc/spammers/hiddenonline/google.search -share/doc/maradns/misc/spammers/hiddenonline/hiddenonline.spam -share/doc/maradns/misc/spammers/hiddenonline/whois.dimeit.com -share/doc/maradns/misc/spammers/hiddenonline/whois.hiddenonline.net -share/doc/maradns/misc/www.monty.de -share/doc/maradns/misc/year_2038_statement.abw -share/doc/maradns/misc/year_2038_statement.html +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/ps/Makefile -share/doc/maradns/ps/README +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 share/doc/maradns/source/authoritative.ej @@ -120,15 +128,27 @@ share/doc/maradns/source/changelog.ej share/doc/maradns/source/changelog.embed share/doc/maradns/source/compile.ej share/doc/maradns/source/convert.ej +share/doc/maradns/source/copy share/doc/maradns/source/credits.ej 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 +share/doc/maradns/source/default_zonefile.ej +share/doc/maradns/source/dns_intro.ej +share/doc/maradns/source/dnsintro.ej +share/doc/maradns/source/dnsmaster.ej +share/doc/maradns/source/dnsslave.ej +share/doc/maradns/source/dnstcp.ej +share/doc/maradns/source/download.ej +share/doc/maradns/source/duende.ej share/doc/maradns/source/ej.doc.format share/doc/maradns/source/ej.template share/doc/maradns/source/example_auth_mararc -share/doc/maradns/source/example_csv1 +share/doc/maradns/source/example_csv2 share/doc/maradns/source/example_full_mararc share/doc/maradns/source/example_mararc share/doc/maradns/source/example_mararc.ej @@ -136,45 +156,129 @@ share/doc/maradns/source/example_recursive_mararc share/doc/maradns/source/example_simple_csv1 share/doc/maradns/source/faq.ej share/doc/maradns/source/faq.embed +share/doc/maradns/source/fetchzone.ej share/doc/maradns/source/files.ej share/doc/maradns/source/getzone.ej share/doc/maradns/source/glossary.ej +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 share/doc/maradns/source/recordtypes.ej share/doc/maradns/source/recursive.ej share/doc/maradns/source/security_design.embed share/doc/maradns/source/tutorial.ej +share/doc/maradns/source/update.ej +share/doc/maradns/source/win_service.ej share/doc/maradns/source/zoneserver.ej +share/doc/maradns/text/Makefile +share/doc/maradns/text/authoritative.txt +share/doc/maradns/text/compile.txt +share/doc/maradns/text/convert.txt +share/doc/maradns/text/dangling.txt +share/doc/maradns/text/default_zonefile.txt +share/doc/maradns/text/dnsintro.txt +share/doc/maradns/text/dnsmaster.txt +share/doc/maradns/text/dnsslave.txt +share/doc/maradns/text/dnstcp.txt +share/doc/maradns/text/glossary.txt +share/doc/maradns/text/man.askmara.txt +share/doc/maradns/text/man.csv2.txt +share/doc/maradns/text/man.csv2_txt.txt +share/doc/maradns/text/man.duende.txt +share/doc/maradns/text/man.fetchzone.txt +share/doc/maradns/text/man.maradns.txt +share/doc/maradns/text/man.mararc.txt +share/doc/maradns/text/man.zoneserver.txt +share/doc/maradns/text/quick_start.txt +share/doc/maradns/text/recordtypes.txt +share/doc/maradns/text/recursive.txt +share/doc/maradns/text/tutorial.txt +share/doc/maradns/text/update.txt +share/doc/maradns/text/win_service.txt share/doc/maradns/tutorial/Makefile share/doc/maradns/tutorial/authoritative.html share/doc/maradns/tutorial/compile.html share/doc/maradns/tutorial/convert.html share/doc/maradns/tutorial/dangling.html +share/doc/maradns/tutorial/default_zonefile.html +share/doc/maradns/tutorial/dnsintro.html +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/man.csv1.html +share/doc/maradns/tutorial/make.index +share/doc/maradns/tutorial/man.askmara.html +share/doc/maradns/tutorial/man.csv2.html +share/doc/maradns/tutorial/man.csv2_txt.html +share/doc/maradns/tutorial/man.duende.html +share/doc/maradns/tutorial/man.fetchzone.html share/doc/maradns/tutorial/man.maradns.html share/doc/maradns/tutorial/man.mararc.html +share/doc/maradns/tutorial/man.zoneserver.html +share/doc/maradns/tutorial/quick_start.html share/doc/maradns/tutorial/recordtypes.html share/doc/maradns/tutorial/recursive.html share/doc/maradns/tutorial/tutorial.html +share/doc/maradns/tutorial/update.html +share/doc/maradns/tutorial/win_service.html +share/doc/maradns/webpage/Makefile +share/doc/maradns/webpage/advocacy.embed +share/doc/maradns/webpage/advocacy.html +share/doc/maradns/webpage/changelog.embed +share/doc/maradns/webpage/changelog.html +share/doc/maradns/webpage/contact.embed +share/doc/maradns/webpage/contact.html +share/doc/maradns/webpage/dns_software.embed +share/doc/maradns/webpage/dns_software.html +share/doc/maradns/webpage/download.embed +share/doc/maradns/webpage/download.html +share/doc/maradns/webpage/faq-1.0.embed +share/doc/maradns/webpage/faq-1.0.html +share/doc/maradns/webpage/faq.embed +share/doc/maradns/webpage/faq.html +share/doc/maradns/webpage/index.embed +share/doc/maradns/webpage/index.html +share/doc/maradns/webpage/license.embed +share/doc/maradns/webpage/license.html +share/doc/maradns/webpage/make.page +share/doc/maradns/webpage/mara-tile.jpg +share/doc/maradns/webpage/maradns-1.2-bottom.html +share/doc/maradns/webpage/maradns-1.2-h.css +share/doc/maradns/webpage/maradns-1.2-l.css +share/doc/maradns/webpage/maradns-1.2-p.css +share/doc/maradns/webpage/maradns-1.2-s.css +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 share/examples/maradns/example_authoritative_mararc.txt share/examples/maradns/example_csv1 share/examples/maradns/example_csv1.txt +share/examples/maradns/example_csv2 share/examples/maradns/example_full_mararc share/examples/maradns/example_mararc share/examples/maradns/example_recursive_mararc.txt @dirrm share/examples/maradns +@dirrm share/doc/maradns/webpage @dirrm share/doc/maradns/tutorial +@dirrm share/doc/maradns/text @dirrm share/doc/maradns/source -@dirrm share/doc/maradns/ps -@dirrm share/doc/maradns/misc/spammers/hiddenonline -@dirrm share/doc/maradns/misc/spammers -@dirrm share/doc/maradns/misc/rfc +@dirrm share/doc/maradns/pdf @dirrm share/doc/maradns/misc/man_macros @dirrm share/doc/maradns/misc/js-manpages +@dirrm share/doc/maradns/misc/csv2-1.4-ideas +@dirrm share/doc/maradns/misc/compression +@dirrm share/doc/maradns/misc/advocacy @dirrm share/doc/maradns/misc +@exec ${MKDIR} %D/share/doc/maradns/man/patch +@dirrm share/doc/maradns/man/patch @dirrm share/doc/maradns/man @dirrm share/doc/maradns diff --git a/net/maradns/distinfo b/net/maradns/distinfo index 9037d8779a6..c8181482ffe 100644 --- a/net/maradns/distinfo +++ b/net/maradns/distinfo @@ -1,16 +1,14 @@ -$NetBSD: distinfo,v 1.8 2006/12/13 04:35:16 obache Exp $ +$NetBSD: distinfo,v 1.9 2007/08/12 01:14:30 joerg Exp $ -SHA1 (maradns-1.0.39.tar.bz2) = ed7a36bca17fb849f449017a89a94d2bb4841c2e -RMD160 (maradns-1.0.39.tar.bz2) = 1d47f05b06e146ce17d4f79e633c3a4c51fe197f -Size (maradns-1.0.39.tar.bz2) = 508565 bytes -SHA1 (patch-aa) = b3d7aa88885167f53b2a956ea0563a58455172ca -SHA1 (patch-ab) = 664188f15cc8068fb8d7572d2fef7870cd998ab7 -SHA1 (patch-ac) = 62bc0b967a16cf4a452b3132e11851078ee73af1 +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 (patch-aa) = 701ae5efa81273285fef83ec14b02476cb8ed36a +SHA1 (patch-ab) = c3b5d86477f0d61434e7b6bed7859fa36741504e +SHA1 (patch-ac) = 37176edca29f35cbf6d6a7818828e740dd19439e SHA1 (patch-ad) = fe7aefd106f448665d6dd30580bb8a967347dc25 -SHA1 (patch-ae) = 2bc8c94f70d6bc0e4ef91338c94c199f169f2724 -SHA1 (patch-af) = a3e1159c32c1a3de754d15b319589b931a29ea83 -SHA1 (patch-ag) = 08e706dd2847ba4b1104664d320cc969f8432e6a -SHA1 (patch-ah) = 727d35feb4861746800be5d61610a1c24cd87cc4 -SHA1 (patch-ai) = 626d6a29e1f0286efd2b2b6acd25fbfcfde42272 -SHA1 (patch-aj) = c8c93bc419c8dd337fcdd45451e85138a5d020d3 -SHA1 (patch-ak) = 7f0b5417e07c6945c24fb3105208031b45e70f1d +SHA1 (patch-ae) = 835704a37a2fc0959de5aaaa4bf7ec57bb1482e2 +SHA1 (patch-ai) = 7bf925bef4d0b9682af9ccea8779bab686987e2d +SHA1 (patch-aj) = b8c98de240712dad2f396e25bee6b6564a0a6e5e +SHA1 (patch-ak) = f7fe72709a91a74dd6ff841f7155da0bd665162e +SHA1 (patch-al) = 72faa0c34b44fffb49a079e958816692f6c90c5f diff --git a/net/maradns/patches/patch-aa b/net/maradns/patches/patch-aa index 3c0956d3c61..a49513ec445 100644 --- a/net/maradns/patches/patch-aa +++ b/net/maradns/patches/patch-aa @@ -1,20 +1,45 @@ -$NetBSD: patch-aa,v 1.3 2005/05/13 13:25:55 salo Exp $ +$NetBSD: patch-aa,v 1.4 2007/08/12 01:14:31 joerg Exp $ ---- server/Makefile.orig 2005-05-07 04:52:38.000000000 +0200 -+++ server/Makefile 2005-05-13 14:46:01.000000000 +0200 -@@ -15,7 +15,7 @@ - #FLAGS = -g $(DEBUG) -DNOTHREAD -DDEBUG - #FLAGS = -g -DDEBUG_MEMORY $(DEBUG) - #FLAGS = -g $(DEBUG) --FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES) -+FLAGS = -g -O2 -Wall $(DEBUG) $(DEFINES) $(CFLAGS) - - all: $(EXECS) - -@@ -35,5 +35,5 @@ - $(CC) -c $(FLAGS) -o timestamp.o timestamp.c - - maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h -- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread -+ $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) $(LDFLAGS) +--- build/install.locations.orig 2007-08-12 02:02:22.000000000 +0200 ++++ build/install.locations +@@ -23,34 +23,14 @@ if [ ! -d doc/$LANGUAGE/man ]; then + fi + # The location of programs that the end user may wish to use +-BIN="$PREFIX/bin/" ++BIN="${DESTDIR}$PREFIX/bin/" + # The location of the server programs +-SBIN="$PREFIX/sbin/" ++SBIN="${DESTDIR}$PREFIX/sbin/" + # The directory to put man pages which describe the end-user programs +-MAN1="$PREFIX/man/man1/" ++MAN1="${DESTDIR}$PREFIX/${PKGMANDIR}/man1/" + # The directory to put man pages which describe configuration file formats +-MAN5="$PREFIX/man/man5/" ++MAN5="${DESTDIR}$PREFIX/${PKGMANDIR}/man5/" + # The directory to put man pages which describe the server programs +-MAN8="$PREFIX/man/man8/" ++MAN8="${DESTDIR}$PREFIX/${PKGMANDIR}/man8/" + # The directory to put a copy of the MaraDNS documents on the system +-DOCS="$PREFIX/doc/maradns-$VERSION" +- +-# Mandrake does not have a /usr/local/man. Ugh. +-# As a result, we need the following kludge to get this to +-# install correctly on Mandrake +-# Thanks to Ole Tange for pointing this out to me. +-# Ignore or erase the following lines if editing this by hand. +- +-# 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" +-fi +-# Do the same with the MAN5 and MAN8 directories +-if [ ! -d $MAN5 ] ; then +- MAN5="/usr/local/share/man/man5" +-fi +-if [ ! -d $MAN8 ] ; then +- MAN8="/usr/local/share/man/man8" +-fi +- ++DOCS="${DESTDIR}$PREFIX/share/doc/maradns" diff --git a/net/maradns/patches/patch-ab b/net/maradns/patches/patch-ab index 34a3e2b450e..9994cadc711 100644 --- a/net/maradns/patches/patch-ab +++ b/net/maradns/patches/patch-ab @@ -1,14 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2003/11/14 21:19:03 cube Exp $ +$NetBSD: patch-ab,v 1.2 2007/08/12 01:14:31 joerg Exp $ ---- configure.orig 2002-01-24 07:43:44.000000000 +0100 -+++ configure -@@ -72,6 +72,9 @@ elif echo $UNAME | grep -i cygwin > /dev - cat $BUILDDIR/Makefile.noflock >> Makefile - echo It looks like you are using Cygwin\; this should compile file - echo by typing in \'make\'. -+elif echo $UNAME | grep -i netbsd > /dev/null ; then -+ cat $BUILDDIR/Makefile.linux >> Makefile -+ echo It looks like you are using NetBSD\; just type in \'make\' - else - cat $BUILDDIR/Makefile.noflock >> Makefile - echo I am not familiar with the OS you are running. Please email +--- build/install.sh.orig 2007-08-12 02:07:37.000000000 +0200 ++++ build/install.sh +@@ -136,6 +136,8 @@ else + cd doc/en/examples + fi + ++exit 0 ++ + # $RPM_BUILD_ROOT was added at the request of one of my users + if [ ! -f $RPM_BUILD_ROOT/etc/mararc ] ; then + cp example_mararc $RPM_BUILD_ROOT/etc/mararc diff --git a/net/maradns/patches/patch-ac b/net/maradns/patches/patch-ac index e0db1ffccd1..80a2313e020 100644 --- a/net/maradns/patches/patch-ac +++ b/net/maradns/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2003/11/14 21:19:03 cube Exp $ +$NetBSD: patch-ac,v 1.2 2007/08/12 01:14:31 joerg Exp $ ---- build/install.locations.orig 2002-05-05 14:11:47.000000000 +0200 -+++ build/install.locations -@@ -33,7 +33,7 @@ MAN5="$PREFIX/man/man5/" - # The directory to put man pages which describe the server programs - MAN8="$PREFIX/man/man8/" - # The directory to put a copy of the MaraDNS documents on the system --DOCS="$PREFIX/doc/maradns-$VERSION" -+DOCS="$PREFIX/share/doc/maradns" +--- configure.orig 2007-08-12 02:10:48.000000000 +0200 ++++ configure +@@ -150,7 +150,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 +- EXITCODE=1 ++ EXITCODE=0 + fi - # Mandrake does not have a /usr/local/man. Ugh. - # As a result, we need the following kludge to get this to + # Set up recursive and authoritative name serving diff --git a/net/maradns/patches/patch-ae b/net/maradns/patches/patch-ae index a285ea42d81..4bc27f23656 100644 --- a/net/maradns/patches/patch-ae +++ b/net/maradns/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2005/05/13 13:25:55 salo Exp $ +$NetBSD: patch-ae,v 1.2 2007/08/12 01:14:31 joerg Exp $ ---- dns/Makefile.orig 2003-08-02 21:39:36.000000000 +0200 -+++ dns/Makefile 2005-05-13 14:52:40.000000000 +0200 -@@ -3,7 +3,7 @@ - MJOBJS=../libs/MaraHash.o - OBJECTS=$(DOBJECTS) $(JOBJS) $(MJOBJS) - --FLAGS = -g -O2 -Wall $(DEBUG) -+FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS) - #FLAGS = -g $(DEBUG) - - all: Queries.o Compress.o bobbit.o Decompress.o +--- 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> diff --git a/net/maradns/patches/patch-ai b/net/maradns/patches/patch-ai index b1d2b86dfd5..4465a7a13b8 100644 --- a/net/maradns/patches/patch-ai +++ b/net/maradns/patches/patch-ai @@ -1,13 +1,23 @@ -$NetBSD: patch-ai,v 1.1 2005/05/13 13:25:55 salo Exp $ +$NetBSD: patch-ai,v 1.2 2007/08/12 01:14:31 joerg Exp $ ---- tuzona/Makefile.orig 2003-08-02 21:39:36.000000000 +0200 -+++ tuzona/Makefile 2005-05-13 14:57:53.000000000 +0200 -@@ -6,7 +6,7 @@ - OBJECTS=$(JOBJS) $(MJOBJS) $(DOBJECTS) $(POBJECTS) $(SOBJECTS) - EXECS=getzone zoneserver +--- 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 --FLAGS = -g -O2 -Wall $(DEBUG) -+FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS) $(LDFLAGS) - #FLAGS = -g $(DEBUG) + 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 - all: $(EXECS) diff --git a/net/maradns/patches/patch-aj b/net/maradns/patches/patch-aj index 6b26645c15e..1de0f64c300 100644 --- a/net/maradns/patches/patch-aj +++ b/net/maradns/patches/patch-aj @@ -1,30 +1,27 @@ -$NetBSD: patch-aj,v 1.1 2005/05/13 13:25:55 salo Exp $ +$NetBSD: patch-aj,v 1.2 2007/08/12 01:14:31 joerg Exp $ ---- parse/Makefile.orig 2003-08-02 21:39:36.000000000 +0200 -+++ parse/Makefile 2005-05-13 15:02:44.000000000 +0200 -@@ -5,10 +5,12 @@ - OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS) - EXECS=parsetest parsetest2 +--- tools/Makefile.orig 2006-01-02 16:59:33.000000000 +0000 ++++ tools/Makefile +@@ -18,17 +18,17 @@ clean: + rm -f core $(EXECS) *.exe --FLAGS = -g -O2 -Wall $(DEBUG) -+FLAGS = -g -O2 -Wall $(DEBUG) $(CFLAGS) - #FLAGS = -g $(DEBUG) + 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) --all: $(EXECS) -+all: $(POBJECTS) -+ -+test: $(EXECS) + 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) - clean: - rm -f $(POBJECTS) core $(EXECS) -@@ -26,8 +28,8 @@ - $(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c + 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) - parsetest: parsetest.c $(OBJECTS) -- $(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) -+ $(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) $(LDFLAGS) + duende: duende.c +- $(CC) $(FLAGS) -o duende duende.c ++ $(CC) ${CFLAGS} ${LDFLAGS} $(FLAGS) -o duende duende.c - parsetest2: parsetest2.c $(OBJECTS) -- $(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) -+ $(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) $(LDFLAGS) + 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 index a21c65755f0..0b17d90f7d0 100644 --- a/net/maradns/patches/patch-ak +++ b/net/maradns/patches/patch-ak @@ -1,13 +1,19 @@ -$NetBSD: patch-ak,v 1.1 2006/01/25 17:48:54 joerg Exp $ +$NetBSD: patch-ak,v 1.2 2007/08/12 01:14:31 joerg Exp $ ---- tuzona/zoneserver.c.orig 2006-01-25 17:47:18.000000000 +0000 -+++ tuzona/zoneserver.c -@@ -15,7 +15,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> +--- 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 new file mode 100644 index 00000000000..7e461f6e37c --- /dev/null +++ b/net/maradns/patches/patch-al @@ -0,0 +1,35 @@ +$NetBSD: patch-al,v 1.1 2007/08/12 01:14:31 joerg Exp $ + +--- server/Makefile.recursive.orig 2006-07-18 03:50:44.000000000 +0000 ++++ server/Makefile.recursive +@@ -33,23 +33,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 + + 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 + |