update to maradns 1.2.07.1

This commit is contained in:
sturm 2006-03-31 16:10:22 +00:00
parent 7eb1060cc2
commit db0fe6c511
9 changed files with 201 additions and 112 deletions

View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2006/03/24 20:12:28 sturm Exp $
# $OpenBSD: Makefile,v 1.3 2006/03/31 16:10:22 sturm Exp $
VERSION= 1.0.28
VERSION= 1.2.07.1
COMMENT= "simple and performant DNS server"
DISTNAME= maradns-${VERSION}
CATEGORIES= net
@ -14,18 +14,16 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c pthread
WANTLIB= c pthread
MAKE_FLAGS= CC="${CC}" FLAGS="${CFLAGS}"
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=maradns/}
MAKE_FLAGS= CC="${CC}" FLAGS="${CFLAGS} -D_THREAD_SAFE -pthread"
NO_REGRESS= Yes
MASTER_SITES= ${HOMEPAGE}/download/ \
http://maradns.3va.net/download/ \
http://maradns.glou.net/download/
post-configure:
@perl -pi -e "s,/etc,${SYSCONFDIR},g" ${WRKSRC}/maragen/mararc.m4 \
${WRKSRC}/parse/ParseMaraRc.c ${WRKSRC}/doc/en/examples/ex*
@find ${WRKSRC} -type f | xargs perl -pi -e "s,/etc,${SYSCONFDIR},g"
@perl -pi -e "s, = 99, = 537," ${WRKSRC}/doc/en/examples/ex*
post-install:

View File

@ -1,4 +1,4 @@
MD5 (maradns-1.0.28.tar.gz) = 287238aef125d7edf4b792c4dc6f4e8f
RMD160 (maradns-1.0.28.tar.gz) = ce0aeaf04ed21be782a76164fba9434c6376d0d9
SHA1 (maradns-1.0.28.tar.gz) = 6f4c9b48a23f8bc663cd3b5f1bcbaf63d533879f
SIZE (maradns-1.0.28.tar.gz) = 708181
MD5 (maradns-1.2.07.1.tar.gz) = 08636a940a0da297614b48dfdb4b1d03
RMD160 (maradns-1.2.07.1.tar.gz) = 6206abcd568934a77772e9c94d8c7bc900d4d774
SHA1 (maradns-1.2.07.1.tar.gz) = 812795e39e8ce3023022a78c36c23edde1041d26
SIZE (maradns-1.2.07.1.tar.gz) = 1091715

View File

@ -1,11 +1,10 @@
$OpenBSD: patch-build_install_sh,v 1.1 2006/03/24 20:12:28 sturm Exp $
--- build/install.sh.orig Fri Nov 15 02:28:49 2002
+++ build/install.sh Fri Nov 15 02:33:20 2002
@@ -109,43 +109,3 @@ mkdir $DOCS > /dev/null 2>&1
cp -r * $DOCS
$OpenBSD: patch-build_install_sh,v 1.2 2006/03/31 16:10:23 sturm Exp $
--- build/install.sh.orig Fri Mar 24 20:44:57 2006
+++ build/install.sh Fri Mar 24 20:45:18 2006
@@ -128,58 +128,3 @@ cp -r * $DOCS
cd $TOPLEVEL
cp maradns.pgp.key $DOCS
-
cp maradns.gpg.key $DOCS
-# If the system in question does not already have configuration files,
-# place example configuration files in /etc
-if [ -d docs/$LANGUAGE/examples ] ; then
@ -14,14 +13,24 @@ $OpenBSD: patch-build_install_sh,v 1.1 2006/03/24 20:12:28 sturm Exp $
- cd doc/en/examples
-fi
-
-# $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
-else
- echo /etc/mararc already there, not replacing
-fi
-if [ ! -d $RPM_BUILD_ROOT/etc/maradns ] ; then
- mkdir $RPM_BUILD_ROOT/etc/maradns
- chmod 755 $RPM_BUILD_ROOT/etc/maradns
-fi
-cp example_csv1 $RPM_BUILD_ROOT/etc/maradns/db.example.com
-if [ ! -d $RPM_BUILD_ROOT/etc/maradns/logger ] ; then
- # The duende tool *needs* an /etc/maradns/logger directory
- # Note that duende uses an absolute path
- mkdir $RPM_BUILD_ROOT/etc/maradns/logger
-fi
-if [ ! -f $RPM_BUILD_ROOT/etc/maradns/db.example.net ] ; then
- cp example_csv2 $RPM_BUILD_ROOT/etc/maradns/db.example.net
-fi
-
-# Finally, set up the startup files, as needed
-# Go back to the top-level MaraDNS directory
@ -32,16 +41,22 @@ $OpenBSD: patch-build_install_sh,v 1.1 2006/03/24 20:12:28 sturm Exp $
- echo Adding MaraDNS startup scripts
- if [ ! -f $RPM_BUILD_ROOT/etc/rc.d/init.d/maradns ] ; then
- cp $BUILDDIR/mara.startup $RPM_BUILD_ROOT/etc/rc.d/init.d/maradns
- cp $BUILDDIR/zoneserver.startup \
- $RPM_BUILD_ROOT/etc/rc.d/init.d/maradns.zoneserver
- fi
- if cd $RPM_BUILD_ROOT/etc/rc.d/rc3.d/ ; then
- echo Starting up MaraDNS at runlevel 3
- rm S60maradns
- rm S60maradns 2> /dev/null
- rm K60maradns.zoneserver 2> /dev/null
- ln -s ../init.d/maradns S60maradns
- ln -s ../init.d/maradns.zoneserver K60maradns.zoneserver
- fi
- if cd $RPM_BUILD_ROOT/etc/rc.d/rc5.d/ ; then
- echo starting up MaraDNS at runlevel 5
- rm S60maradns
- rm S60maradns 2> /dev/null
- rm K60maradns.zoneserver 2> /dev/null
- ln -s ../init.d/maradns S60maradns
- ln -s ../init.d/maradns.zoneserver K60maradns.zoneserver
- fi
-fi
-

View File

@ -1,14 +1,22 @@
$OpenBSD: patch-configure,v 1.1 2006/03/24 20:12:28 sturm Exp $
--- configure.orig Wed Nov 13 18:14:04 2002
+++ configure Wed Nov 13 18:17:30 2002
@@ -66,8 +66,8 @@ elif echo $UNAME | grep -i freebsd > /de
echo http://www.freebsd.org/cgi/query-pr.cgi?pr=28389
elif echo $UNAME | grep -i openbsd > /dev/null ; then
cat $BUILDDIR/Makefile.linux >> Makefile
- echo It looks like you are using OpenBSD\; please read FAQ
- echo before trying to compile MaraDNS
+ echo It looks like you are using OpenBSD\; proceeding the
+ echo compile of MaraDNS.
elif echo $UNAME | grep -i cygwin > /dev/null ; then
cat $BUILDDIR/Makefile.noflock >> Makefile
echo It looks like you are using Cygwin\; this should compile file
$OpenBSD: patch-configure,v 1.2 2006/03/31 16:10:23 sturm Exp $
--- configure.orig Fri Mar 24 20:55:47 2006
+++ configure Fri Mar 24 20:57:15 2006
@@ -77,6 +77,18 @@ elif echo $UNAME | grep -i freebsd > /de
echo /usr/ports/dns/maradns
echo
EXITCODE=0
+elif echo $UNAME | grep -i openbsd > /dev/null ; then
+ cat $BUILDDIR/Makefile.freebsd >> Makefile
+ echo It looks like you are using OpenBSD\; this should compile
+ echo fine by typing in \'make\'. There is an official port here:
+ echo
+ echo http://www.openbsd.org/cgi-bin/cvsweb/ports/net/maradns/
+ echo
+ echo Which may be on your system here:
+ echo
+ echo /usr/ports/net/maradns
+ echo
+ EXITCODE=0
elif echo $UNAME | grep -i mingw32 > /dev/null ; then
cat $BUILDDIR/Makefile.mingw32 >> Makefile
echo It looks like you are using MinGW32 \; this is only a partial

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-parse_Makefile,v 1.1 2006/03/24 20:12:28 sturm Exp $
--- parse/Makefile.orig Sat Oct 9 09:30:31 2004
+++ parse/Makefile Sat Oct 9 09:31:43 2004
@@ -25,6 +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
+../server/timestamp.o:
+ $(CC) -c $(FLAGS) -o ../server/timestamp.o ../server/timestamp.c
+
parsetest: parsetest.c $(OBJECTS)
$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-tuzona_zoneserver_c,v 1.1 2006/03/24 20:12:28 sturm Exp $
--- tuzona/zoneserver.c.orig Sat Nov 12 23:14:04 2005
+++ tuzona/zoneserver.c Sat Nov 12 23:16:08 2005
@@ -15,7 +15,7 @@
#include <errno.h>
#include <string.h>
#include <time.h>
-#ifdef __FreeBSD__
+#if defined __FreeBSD__ || defined __OpenBSD__
#include <sys/time.h>
#endif
#include <sys/types.h>

View File

@ -1,17 +1,5 @@
maradns is a DNS server written with security, simplicity,
and performance in mind.
Features:
* Security-aware programming.
A DNS server needs to be secure.
There's a number of security features in the code, including:
1. The code uses a special string library which is resistant
to buffer overflows.
2. The code, if started as root, mandates running as an
unprivileged user in a chroot() jail.
* Open-Source.
This DNS server is public-domain code.
There are no restrictions attached to this code.
* Simplicity.
This DNS server has the minimum number of features needed to correctly
act as an authoritative and/or recursive name server.
MaraDNS is a package that implements the Domain Name Service (DNS), an
essential internet service. MaraDNS is intended to be an easy-to-use DNS
server for environments where a DNS server must be secure, and where the
server must use the absolute minimum number of resources possible (such
as on older PCs and embedded wi-fi routers).

View File

@ -1,4 +0,0 @@
A complete set of documentation for MaraDNS has been installed
in ${PREFIX}/share/doc/maradns
It contains a FAQ, configuration examples and full instructions
on how to setup MaraDNS.

View File

@ -1,12 +1,18 @@
@comment $OpenBSD: PLIST,v 1.1 2006/03/24 20:12:29 sturm Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/03/31 16:10:23 sturm Exp $
@newgroup _maradns:537
@newuser _maradns:537:_maradns::MaraDNS Account:${SYSCONFDIR}/maradns:/sbin/nologin
bin/askmara
bin/duende
bin/fetchzone
bin/getzone
@man man/man1/askmara.1
@man man/man1/fetchzone.1
@man man/man1/getzone.1
@man man/man5/csv1.5
@man man/man5/csv2.5
@man man/man5/csv2_txt.5
@man man/man5/mararc.5
@man man/man8/duende.8
@man man/man8/maradns.8
@man man/man8/zoneserver.8
sbin/maradns
@ -18,6 +24,7 @@ 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
@ -26,26 +33,31 @@ share/doc/maradns/man/
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/patch/
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/
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/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/
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/
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/
@ -100,7 +112,6 @@ 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
@ -109,21 +120,15 @@ share/doc/maradns/misc/recursive.algorithm
share/doc/maradns/misc/resolution.algorithm
share/doc/maradns/misc/rfc/
share/doc/maradns/misc/rfc/rfc1035.txt
share/doc/maradns/misc/rtest.output
share/doc/maradns/misc/spammers/
share/doc/maradns/misc/spammers/azmalink.net
share/doc/maradns/misc/spammers/hiddenonline/
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/
share/doc/maradns/ps/Makefile
share/doc/maradns/ps/README
share/doc/maradns/pdf/
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/
share/doc/maradns/source/SOURCE.FILES
share/doc/maradns/source/askmara.ej
@ -132,14 +137,26 @@ 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_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
@ -147,34 +164,126 @@ 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/maradns.ej
share/doc/maradns/source/mararc.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/zoneserver.ej
share/doc/maradns/text/
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/tutorial/
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/webpage/
share/doc/maradns/webpage/Makefile
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/old/
share/doc/maradns/webpage/old/DESIGN.NOTES
share/doc/maradns/webpage/old/README
share/doc/maradns/webpage/old/head.html
share/doc/maradns/webpage/old/head_commented.html
share/doc/maradns/webpage/old/maradns.css
share/doc/maradns/webpage/old/maradns_p.css
share/doc/maradns/webpage/old/mixed_css_try2.html
share/doc/maradns/webpage/old/mixed_css_try3.html
share/doc/maradns/webpage/old/page.htm
share/doc/maradns/webpage/old/pure_css-2.html
share/doc/maradns/webpage/old/pure_css.html
share/doc/maradns/webpage/old/tail.html
share/doc/maradns/webpage/roadmap.embed
share/doc/maradns/webpage/roadmap.html
share/doc/maradns/webpage/roadmap.rm.html
share/doc/maradns/webpage/security.embed
share/doc/maradns/webpage/security.html
share/examples/maradns/
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
@sample ${SYSCONFDIR}/maradns/
@extraunexec rm -f ${SYSCONFDIR}/maradns/*
@extra ${SYSCONFDIR}/mararc