update to maradns 1.3.07.09
based on a diff by Vlad Glagolev
This commit is contained in:
sturm
parent
49634dbe14
commit
9bfed0d940
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2008/01/07 21:24:07 bernd Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2008/08/20 20:13:36 sturm Exp $
|
||||
|
||||
VERSION= 1.2.12.09
|
||||
VERSION= 1.3.07.09
|
||||
COMMENT= simple and performant DNS server
|
||||
DISTNAME= maradns-${VERSION}
|
||||
CATEGORIES= net
|
||||
@ -16,7 +16,7 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c pthread
|
||||
|
||||
MASTER_SITES= http://www.maradns.org/download/1.2/${VERSION}/
|
||||
MASTER_SITES= http://www.maradns.org/download/1.3/${VERSION}/
|
||||
|
||||
MAKE_FLAGS= CC="${CC}" FLAGS="${CFLAGS} -D_THREAD_SAFE -pthread"
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (maradns-1.2.12.09.tar.gz) = aLWynaatuXcpOTI9lamC4g==
|
||||
RMD160 (maradns-1.2.12.09.tar.gz) = ijHu+ACw4Qj/Cb/wY16Y0icmV9s=
|
||||
SHA1 (maradns-1.2.12.09.tar.gz) = grX3ij0pTV9xBaZdASxLoM11uRw=
|
||||
SHA256 (maradns-1.2.12.09.tar.gz) = LhVorTFRMGCw7dCN7K4xFz3P6c3lwe3CEYCwbfnBSV0=
|
||||
SIZE (maradns-1.2.12.09.tar.gz) = 1375325
|
||||
MD5 (maradns-1.3.07.09.tar.gz) = YafFdehJHYJdi4ViG+zDTg==
|
||||
RMD160 (maradns-1.3.07.09.tar.gz) = GKqW1mebFb3D0EhcPG5qW8aLWyY=
|
||||
SHA1 (maradns-1.3.07.09.tar.gz) = 8396fx5NpGllAC6gzOCuK1hTNn8=
|
||||
SHA256 (maradns-1.3.07.09.tar.gz) = ImpO0Klpb1Iwxe2oAUKvxvp1YRHayK5IS7moK8G883M=
|
||||
SIZE (maradns-1.3.07.09.tar.gz) = 1386748
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
$OpenBSD: patch-build_install_sh,v 1.3 2007/06/06 23:29:55 rui Exp $
|
||||
--- build/install.sh.orig Mon Dec 12 06:17:27 2005
|
||||
+++ build/install.sh Wed Jun 6 11:37:20 2007
|
||||
$OpenBSD: patch-build_install_sh,v 1.4 2008/08/20 20:13:36 sturm Exp $
|
||||
--- build/install.sh.orig Mon Aug 18 17:56:22 2008
|
||||
+++ build/install.sh Mon Aug 18 17:57:31 2008
|
||||
@@ -128,58 +128,3 @@ cp -r * $DOCS
|
||||
cd $TOPLEVEL
|
||||
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
|
||||
-if [ -d doc/$LANGUAGE/examples ] ; then
|
||||
- cd doc/$LANGUAGE/examples
|
||||
-else
|
||||
- cd doc/en/examples
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2007/06/06 23:29:55 rui Exp $
|
||||
--- configure.orig Tue May 16 00:28:36 2006
|
||||
+++ configure Wed Jun 6 11:37:20 2007
|
||||
$OpenBSD: patch-configure,v 1.5 2008/08/20 20:13:36 sturm Exp $
|
||||
--- configure.orig Mon Aug 18 17:49:49 2008
|
||||
+++ configure Mon Aug 18 17:54:04 2008
|
||||
@@ -82,6 +82,9 @@ elif echo $UNAME | grep -i openbsd > /dev/null ; then
|
||||
echo It looks like you are using OpenBSD\; this should compile
|
||||
echo fine by typing in \'make\'.
|
||||
@ -11,3 +11,14 @@ $OpenBSD: patch-configure,v 1.4 2007/06/06 23:29:55 rui Exp $
|
||||
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
|
||||
@@ -164,6 +167,10 @@ if [ -z "$AUTHONLY" ] ; then
|
||||
# FreeBSD uses -pthread instead of -lpthread to compile a
|
||||
# Pthread program
|
||||
if echo $UNAME | grep -i freebsd > /dev/null ; then
|
||||
+ cat server/Makefile.recursive | \
|
||||
+ sed 's/lpthread/pthread/' > server/Makefile
|
||||
+ fi
|
||||
+ if echo $UNAME | grep -i openbsd > /dev/null ; then
|
||||
cat server/Makefile.recursive | \
|
||||
sed 's/lpthread/pthread/' > server/Makefile
|
||||
fi
|
||||
|
||||
11
net/maradns/patches/patch-server_udpsuccess_c
Normal file
11
net/maradns/patches/patch-server_udpsuccess_c
Normal file
@ -0,0 +1,11 @@
|
||||
$OpenBSD: patch-server_udpsuccess_c,v 1.1 2008/08/20 20:13:36 sturm Exp $
|
||||
--- server/udpsuccess.c.orig Mon Aug 18 17:51:38 2008
|
||||
+++ server/udpsuccess.c Mon Aug 18 17:51:54 2008
|
||||
@@ -17,6 +17,7 @@
|
||||
*/
|
||||
|
||||
#ifndef MINGW32
|
||||
+#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/socket.h>
|
||||
12
net/maradns/patches/patch-tcp_zoneserver_c
Normal file
12
net/maradns/patches/patch-tcp_zoneserver_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-tcp_zoneserver_c,v 1.1 2008/08/20 20:13:36 sturm Exp $
|
||||
--- tcp/zoneserver.c.orig Mon Aug 18 17:55:03 2008
|
||||
+++ tcp/zoneserver.c Mon Aug 18 17:55:17 2008
|
||||
@@ -1014,7 +1014,7 @@ int main(int argc, char **argv) {
|
||||
js_string *synth_soa_origin;
|
||||
|
||||
/* Kill children processes when we are signaled */
|
||||
- if(setpgrp()) {
|
||||
+ if(setpgrp(0,0)) {
|
||||
printf(strerror(errno)); /* harderror() would kill the group which may not be correct yet */
|
||||
return 3;
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2007/01/08 19:18:05 sturm Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2008/08/20 20:13:36 sturm Exp $
|
||||
@pkgpath net/maradns/stable
|
||||
@newgroup _maradns:537
|
||||
@newuser _maradns:537:_maradns::MaraDNS Account:${SYSCONFDIR}/maradns:/sbin/nologin
|
||||
bin/askmara
|
||||
bin/duende
|
||||
bin/fetchzone
|
||||
bin/getzone
|
||||
@bin bin/askmara
|
||||
@bin bin/duende
|
||||
@bin bin/fetchzone
|
||||
@bin bin/getzone
|
||||
@man man/man1/askmara.1
|
||||
@man man/man1/fetchzone.1
|
||||
@man man/man1/getzone.1
|
||||
@ -16,22 +16,21 @@ bin/getzone
|
||||
@man man/man8/duende.8
|
||||
@man man/man8/maradns.8
|
||||
@man man/man8/zoneserver.8
|
||||
sbin/maradns
|
||||
sbin/zoneserver
|
||||
@bin sbin/maradns
|
||||
@bin sbin/zoneserver
|
||||
share/doc/maradns/
|
||||
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/man/
|
||||
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
|
||||
@ -48,25 +47,8 @@ share/doc/maradns/man/zoneserver.8
|
||||
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/advocacy/
|
||||
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/
|
||||
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/
|
||||
share/doc/maradns/misc/js-manpages/README
|
||||
share/doc/maradns/misc/js-manpages/js_alloc.3
|
||||
@ -113,33 +95,25 @@ share/doc/maradns/misc/js-manpages/js_tolower.3
|
||||
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/
|
||||
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/
|
||||
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
|
||||
share/doc/maradns/source/authoritative.ej
|
||||
share/doc/maradns/source/bind2csv2-man.ej
|
||||
share/doc/maradns/source/bind2csv2.ej
|
||||
share/doc/maradns/source/changelog.ej
|
||||
share/doc/maradns/source/changelog.embed
|
||||
share/doc/maradns/source/coding_style.ej
|
||||
share/doc/maradns/source/compile.ej
|
||||
share/doc/maradns/source/convert.ej
|
||||
share/doc/maradns/source/copy
|
||||
@ -182,6 +156,7 @@ 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/troubleshoot.ej
|
||||
share/doc/maradns/source/tutorial.ej
|
||||
share/doc/maradns/source/update.ej
|
||||
share/doc/maradns/source/win_service.ej
|
||||
@ -189,6 +164,8 @@ 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/bind2csv2.txt
|
||||
share/doc/maradns/text/coding_style.txt
|
||||
share/doc/maradns/text/compile.txt
|
||||
share/doc/maradns/text/convert.txt
|
||||
share/doc/maradns/text/dangling.txt
|
||||
@ -209,12 +186,16 @@ 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/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/
|
||||
share/doc/maradns/tutorial/00index.html
|
||||
share/doc/maradns/tutorial/Makefile
|
||||
share/doc/maradns/tutorial/authoritative.html
|
||||
share/doc/maradns/tutorial/bind2csv2.html
|
||||
share/doc/maradns/tutorial/coding_style.html
|
||||
share/doc/maradns/tutorial/compile.html
|
||||
share/doc/maradns/tutorial/convert.html
|
||||
share/doc/maradns/tutorial/dangling.html
|
||||
@ -224,6 +205,7 @@ 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
|
||||
@ -236,6 +218,7 @@ 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/troubleshoot.html
|
||||
share/doc/maradns/tutorial/tutorial.html
|
||||
share/doc/maradns/tutorial/update.html
|
||||
share/doc/maradns/tutorial/win_service.html
|
||||
@ -247,6 +230,8 @@ 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/debian.embed
|
||||
share/doc/maradns/webpage/debian.html
|
||||
share/doc/maradns/webpage/dns_software.embed
|
||||
share/doc/maradns/webpage/dns_software.html
|
||||
share/doc/maradns/webpage/download.embed
|
||||
|
||||
Loading…
Reference in New Issue
Block a user