ports/opt (3.1): [notify] maradns: update to 2.0.11

crux at crux.nu crux at crux.nu
Wed Apr 15 11:48:20 UTC 2015


commit 5f6063a0523fd51ce4190b16b0759cde8baf45c9
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Apr 15 13:38:03 2015 +0200

    [notify] maradns: update to 2.0.11
    
    Note
    ----
    Version 2 of maradns is a authoritative only DNS server without the
    resolver part. The recursive and caching DNS resolver from the same
    author, called deadwood, is available as a separate port now. See the
    tutorial in [1] how both can work together. Using the DNSSEC capable
    unbound instead of deadwood might be an option as well.
    
    [1] http://maradns.samiam.org/tutorial/recursive.html

diff --git a/maradns/.footprint b/maradns/.footprint
index 606b834..558086e 100644
--- a/maradns/.footprint
+++ b/maradns/.footprint
@@ -10,7 +10,6 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/askmara
--rwxr-xr-x	root/root	usr/bin/duende
 -rwxr-xr-x	root/root	usr/bin/fetchzone
 -rwxr-xr-x	root/root	usr/bin/getzone
 drwxr-xr-x	root/root	usr/man/
@@ -24,12 +23,8 @@ drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/csv2_txt.5.gz
 -rw-r--r--	root/root	usr/man/man5/mararc.5.gz
 drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/duende.8.gz
 -rw-r--r--	root/root	usr/man/man8/maradns.8.gz
 -rw-r--r--	root/root	usr/man/man8/zoneserver.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/maradns
 -rwxr-xr-x	root/root	usr/sbin/zoneserver
-drwxr-xr-x	root/root	var/
-drwxr-xr-x	root/root	var/log/
--rw-r--r--	root/root	var/log/maradns.log (EMPTY)
diff --git a/maradns/.md5sum b/maradns/.md5sum
index 0037202..ac1b392 100644
--- a/maradns/.md5sum
+++ b/maradns/.md5sum
@@ -1,4 +1,4 @@
 6e2f5cfb258b8955fa345a2070b6c4b0  db.localhost
-020d9bffda1f19fa9287c80672554ecf  maradns
-57bd1d440b33aec30c22daa17865c5cb  maradns-1.4.15.tar.xz
-5b860ff2ae93ffe85ba24500618d17b8  mararc
+0dce90ec6ee5c8a368ec692ec9d5ccc5  maradns
+829334629f591e84fb4c5dd126b80ec2  maradns-2.0.11.tar.bz2
+8205d9a6cdeba454d173847fd44168a3  mararc
diff --git a/maradns/Pkgfile b/maradns/Pkgfile
index 6ef92fc..ac51391 100644
--- a/maradns/Pkgfile
+++ b/maradns/Pkgfile
@@ -1,30 +1,38 @@
-# Description: A authoritative,recursive (caching) DNS server that strives to be secure and fast
+# Description: A authoritative only DNS server that strives to be secure and fast
 # URL:         http://www.maradns.org/
 # Maintainer:  Juergen Daubert, jue at crux dot nu
 
 name=maradns
-version=1.4.15
+version=2.0.11
 release=1
-source=(http://maradns.samiam.org/download/1.4/$name-$version.tar.xz \
+source=(http://maradns.samiam.org/download/2.0/$version/$name-$version.tar.bz2 \
         mararc maradns db.localhost)
 
 build () {
     cd maradns-$version
 
     install -d  $PKG/usr/{bin,sbin,man/man{1,5,8}}
-    install -d  $PKG/{etc/{rc.d,maradns},var/log}
+    install -d  $PKG/etc/{rc.d,maradns}
 
     sed -i "/^FLAGS/s/-O2/$CFLAGS/" build/Makefile.linux
+
     ./configure
     make -j1
     make PREFIX=$PKG/usr RPM_BUILD_ROOT=$PKG install
 
+    # remove deadwood
+    rm $PKG/usr/sbin/Deadwood
+    rm $PKG/usr/man/man1/Deadwood.1
+    rm $PKG/etc/dwood3rc
+
+    # remove duende
+    rm $PKG/usr/bin/duende
+    rm $PKG/usr/man/man8/duende.8
+
     rm -r $PKG/usr/doc
     mv $PKG/etc/mararc $PKG/etc/mararc.sample
 
     install -m 644 $SRC/mararc $PKG/etc
     install -m 644 $SRC/db.* $PKG/etc/maradns
     install -m 755 $SRC/maradns $PKG/etc/rc.d
-
-    touch $PKG/var/log/maradns.log
 }
diff --git a/maradns/maradns b/maradns/maradns
index edec21b..cc21e05 100644
--- a/maradns/maradns
+++ b/maradns/maradns
@@ -1,23 +1,35 @@
 #!/bin/sh
 #
-# /etc/rc.d/maradns: start/stop mara DNS server
+# /etc/rc.d/deadwood: start/stop deadwood DNS resolver
 #
 
+SSD=/sbin/start-stop-daemon
+PROG=/usr/sbin/maradns
+PID=/var/run/maradns.pid
+LOG=/var/log/maradns.log
+
 case $1 in
 start)
-	setsid /usr/sbin/maradns >> /var/log/maradns.log &
+	$SSD --start -bmC --pidfile $PID --exec $PROG >> $LOG 2>&1
 	;;
 stop)
-	killall -q /usr/sbin/maradns
+	$SSD --stop --remove-pidfile --retry 10 --pidfile $PID
 	;;
 restart)
 	$0 stop
-	sleep 2
 	$0 start
 	;;
+status)
+	$SSD --status --pidfile $PID
+	case $? in
+	0) echo "$PROG is running with pid $(cat $PID)" ;;
+	1) echo "$PROG is not running but the pid file $PID exists" ;;
+	3) echo "$PROG is not running" ;;
+	4) echo "Unable to determine the program status" ;;
+	esac
+	;;
 *)
-	echo "usage: $0 [start|stop|restart]"
+	echo "usage: $0 [start|stop|restart|status]"
 	;;
 esac
-
 # End of file
diff --git a/maradns/mararc b/maradns/mararc
index d7da972..79552d7 100644
--- a/maradns/mararc
+++ b/maradns/mararc
@@ -20,45 +20,16 @@ verbose_level = 3
 debug_msg_level = 3
 
 # The addresses mara bind to
-# CHANGING THIS IS REQUIRED !
-ipv4_bind_addresses = "127.0.0.1,192.168.0.1"
+ipv4_bind_addresses = "127.0.0.1"
 
 # The various zones we support
 csv2 = {}
 csv2["localhost."] = "db.localhost"
 # csv2["example.net."] = "db.example.net"
 
-# ACL for localhost, localnet
-# CHANGING THIS IS REQUIRED !
+# ACL for localhost
 ipv4_alias = {}
 ipv4_alias["localhost"] = "127.0.0.0/8"
-ipv4_alias["localnet"] = "192.168.0.0/24"
-recursive_acl = "localhost,localnet"
-zone_transfer_acl = "localnet"
-admin_acl = "localhost,localnet"
-
-# The root servers which we use when making recursive queries.
-# http://www.icann.org
-ipv4_alias["icann"]  = "198.41.0.4,192.228.79.201,192.33.4.12,128.8.10.90,"
-ipv4_alias["icann"] += "192.203.230.10,192.5.5.241,192.112.36.4,"
-ipv4_alias["icann"] += "128.63.2.53,192.36.148.17,192.58.128.30,"
-ipv4_alias["icann"] += "193.0.14.129,199.7.83.42,202.12.27.33"
-
-# ORSN, Open Root Server Network (http://www.orsn.org)
-ipv4_alias["orsn"]  = "217.146.128.77,193.238.157.7,212.7.160.13,195.226.7.66,"
-ipv4_alias["orsn"] += "213.161.0.90,193.138.173.218,82.102.0.9,213.144.148.130,"
-ipv4_alias["orsn"] += "194.116.123.194,193.93.167.222,217.173.157.225,"
-ipv4_alias["orsn"] += "192.83.249.100,213.145.82.34"
-
-root_servers = {}
-root_servers["."] = "icann"
-
-# upstream_servers = {}
-# upstream_servers["."] = "usually_your_isps_dns_servers"
-# ORSN, puplic nameservers
-# upstream_servers["."] = "217.146.139.5,62.157.101.211"
-# Google, puplic nameservers
-# upstream_servers["."] = "8.8.8.8,8.8.4.4"
-
+admin_acl = "localhost"
 
 # End of file



More information about the CRUX mailing list