Remove 1.4.06, and add 1.4.11. Also add 2.0.06 in, as well as several patches from Debian and newer init scripts.

(Portage version: 2.1.10.45/cvs/Linux x86_64)

11 files changed, 1010 insertions, 10 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index eaaf82e74d82..9933d4c9c840 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-dns/maradns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.46 2012/02/01 17:14:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.47 2012/03/12 12:24:50 kumba Exp $
+
+*maradns-2.0.06 (12 Mar 2012)
+*maradns-1.4.11 (12 Mar 2012)
+
+  12 Mar 2012; Joshua Kinard <kumba@gentoo.org> -maradns-1.4.06.ebuild,
+  +maradns-1.4.11.ebuild, +maradns-2.0.06.ebuild,
+  +files/maradns-2.0.06-askmara-tcp.patch,
+  +files/maradns-2.0.06-duende-man.patch, +files/maradns-2.0.06-groff.patch,
+  +files/deadwood, +files/maradns2, +files/zoneserver2, files/maradns.rc6,
+  files/zoneserver.rc6:
+  Remove 1.4.06, and add 1.4.11. Also add 2.0.06 in, as well as several patches
+  from Debian and newer init scripts.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> maradns-1.4.09.ebuild:
   Marking maradns-1.4.09 ppc for bug 397431
diff --git a/net-dns/maradns/files/deadwood b/net-dns/maradns/files/deadwood
new file mode 100644
index 000000000000..4ab746b3d341
--- /dev/null
+++ b/net-dns/maradns/files/deadwood
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/deadwood,v 1.1 2012/03/12 12:24:50 kumba Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting deadwood"
+	start-stop-daemon --start --quiet --name deadwood --wait 1000 \
+		--exec /usr/bin/duende /usr/sbin/Deadwood -- -f /etc/maradns/dwood3rc
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping deadwood"
+	start-stop-daemon --stop --quiet --name deadwood --wait 1000 \
+		--exec /usr/bin/duende
+	eend $?
+}
diff --git a/net-dns/maradns/files/maradns-2.0.06-askmara-tcp.patch b/net-dns/maradns/files/maradns-2.0.06-askmara-tcp.patch
new file mode 100644
index 000000000000..107097159c83
--- /dev/null
+++ b/net-dns/maradns/files/maradns-2.0.06-askmara-tcp.patch
@@ -0,0 +1,251 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: askmara-tcp lazily copies askmara usage and man page
+Last-Updated: 2011-09-21
+Forwarded: no
+--- a/tools/askmara_labels_en.h
++++ b/tools/askmara_labels_en.h
+@@ -1,11 +1,12 @@
+ /* Placed in the public domain 2001 by Sam Trenholme */
+ 
+-/* All of the labels for replies used in askmara */
++/* All of the labels for replies used in askmara(-tcp) */
+ 
+ #define L_NEWLINE "\n"
+ #define L_HARD_ERROR "Hard Error: "
+ #define L_QUERYING "Querying the server with the IP "
+ #define L_USAGE "Usage: askmara [-n] [-v | -t timeout] Query [server]\n#Example: askmara Ayahoo.com."
++#define L_USAGE_TCP "Usage: askmara-tcp [-n] [-v | -t timeout] Query [server]\n#Example: askmara-tcp Ayahoo.com."
+ #define L_JS_CREATE_INDATA "js_create with indata"
+ #define L_JS_CREATE_UINDATA "js_create with uindata"
+ #define L_JS_CREATE_OUTDATA "js_create with outdata"
+--- a/tools/askmara-tcp.c
++++ b/tools/askmara-tcp.c
+@@ -190,7 +190,7 @@
+             nrd = 1;
+         else if(argv[0][0] == '-' && argv[0][1] == 'p') {
+             if(argc < 2) {
+-                harderror(L_USAGE);
++                harderror(L_USAGE_TCP);
+                 }
+             argc--;
+             argv++;
+@@ -201,7 +201,7 @@
+             }
+         else if(argv[0][0] == '-' && argv[0][1] == 't') {
+             if(argc < 2) {
+-                harderror(L_USAGE);
++                harderror(L_USAGE_TCP);
+                 }
+             argc--;
+             argv++;
+@@ -213,14 +213,14 @@
+         else if (argv[0][0] != '-')
+             break;
+         else
+-            harderror(L_USAGE);
++            harderror(L_USAGE_TCP);
+         argc--;
+         argv++;
+         }
+ 
+     /* we expect now the query string and possibly the server */
+     if(argc<1)
+-        harderror(L_USAGE);
++        harderror(L_USAGE_TCP);
+ 
+     /* Determine what IP address to connect to */
+     if(argc>1)
+--- /dev/null
++++ b/doc/en/man/askmara-tcp.1
+@@ -0,0 +1,191 @@
++.\" Do *not* edit this file; it was automatically generated by ej2man
++.\" Look for a name.ej file with the same name as this filename
++.\"
++.\" Process this file with the following
++.\" nroff -man -Tutf8 maradns.8 | tr '\020' ' '
++.\"
++.\" Last updated Mon Sep 27 15:36:06 2010
++.\"
++.TH ASKMARA-TCP 1 "askmara-tcp" "January 2002" "askmara-tcp"
++.\" We don't want hyphenation (it's too ugly)
++.\" We also disable justification when using nroff
++.\" Due to the way the -mandoc macro works, this needs to be placed
++.\" after the .TH heading
++.hy 0
++.if n .na
++.\"
++.\" We need the following stuff so that we can have single quotes
++.\" In both groff and other UNIX *roff processors
++.if \n(.g .mso www.tmac
++.ds aq \(aq
++.if !\n(.g .if '\(aq'' .ds aq \'
++
++.SH "NAME"
++.PP
++askmara-tcp \- do simple dns queries over TCP
++.SH "DESCRIPTION"
++.PP
++.B "askmara-tcp"
++queries the user-specified dns server for records, and
++outputs the reply in a csv2-compatible format (csv2 is the format of
++zone
++files that
++.B "maradns"
++uses). However unlike
++.B "askmara"
++it uses TCP rather than UDP.
++.SH "USAGE"
++.PP
++.B "askmara-tcp"
++.RB [ -n ]
++.RB [ -v | -t
++.IR timeout ]
++.I query
++.RI [ server ]
++.SH "OPTIONS"
++.PP
++.TP 4
++.BI -t
++If this is present, the following argument is the askmara-tcp
++.IR timeout ,
++in seconds. Note that
++.B "askmara-tcp"
++can not both have a user-defined
++timeout and verbose output.
++.TP 4
++.BI -v
++If this is set,
++.B "askmara-tcp"
++will verbosely output the complete reply that the server sent. Note
++that this verbose output is not csv2-compatible.
++.TP 4
++.BI -n
++If this is set,
++.BR "askmara-tcp" ","
++when sending out a query, will not
++request DNS recursion; in other words, askmara-tcp will request that the
++remote DNS server not contact other DNS servers to answer the query in
++question.
++.TP 4
++.I query
++dns record to be queried. The query has two sections:
++The type of record we desire, and the hostname we want this record for.
++.PP
++The type of query can have two forms: A one-letter mnemonic, or a
++numeric rtype followed by a colon. This is immediately concatenated by
++the full name of the host name we wish to look up.
++.PP
++For example, to ask for the IP of \(aqexample.com.\(aq, we can use the
++one-letter
++mnemonic, in the form \(aqAexample.com.\(aq, or we can use the numeric
++RR followed
++by a colon, giving the query \(aq1:example.com.\(aq (since A has the
++record type
++of one). Note that the query name needs the trailing dot at the end.
++.PP
++Askmara supports a handful one-letter mnemonics, as follows:
++.PP
++.B "A"
++signifies a request for an A (ipv4 address) RR
++.PP
++.B "N"
++signifies a NS RR
++.PP
++.B "C"
++signifies that we are asking for a CNAME RR
++.PP
++.B "S"
++signifies that we want a SOA RR
++.PP
++.B "P"
++signifies that we want a PTR RR
++.PP
++.B "@"
++signifies that we mant a MX RR
++.PP
++.B "T"
++signifies that we want a TXT RR
++.PP
++.B "Z"
++signifies that we want to ask for all RRs.
++.TP 4
++.I server
++IP address of the dns server to be queried. If no server is given,
++askmara-tcp will query 127.0.0.1.
++.PP
++.SH "EXAMPLES"
++.PP
++Asking the server with the ip 127.0.0.1 for the IP address of
++example.com:
++
++.nf
++askmara-tcp Aexample.com.
++.fi
++
++Asking the server with the ip 198.41.0.4 for the IP address of
++example.com:
++
++.nf
++askmara-tcp Aexample.com. 198.41.0.4
++.fi
++
++Asking the server with the ip address 127.0.0.1 for the IP address of
++example.com, using the rr_number:query format:
++
++.nf
++askmara-tcp 1:example.com.
++.fi
++
++Asking the server with the ip address 127.0.0.1 for a SRV record. In
++particular, we ask for the "http over tcp" service for example.net.
++Since askmara-tcp doesn\(aqt have a mnemonic for SRV record types, we
++use the numeric code (33 for SRV):
++
++.nf
++askmara-tcp 33:_http._tcp.example.net.
++.fi
++
++Asking the server with the ip address 127.0.0.1 for the AAAA (ipv6 ip)
++record for example.net:
++
++.nf
++askmara-tcp 28:example.net.
++.fi
++
++Note that the output will be a raw DNS packet in both the SRV
++and AAAA examples.
++.SH "BUGS"
++.PP
++When askmara-tcp is asked for an SOA record, the output of
++.B "askmara-tcp"
++closely resembles the format of a csv2 file, but can not be parsed as a
++csv2 file without modification.
++.PP
++askmara-tcp outputs multi-chunk ("character-string") TXT
++records incorrectly (it only outputs the first chunk).
++.SH "SEE ALSO"
++.PP
++.B maradns(8),
++.B askmara(1)
++
++.br
++http://www.maradns.org
++.SH "LEGAL DISCLAIMER"
++.PP
++THIS SOFTWARE IS PROVIDED BY THE AUTHORS \(aq\(aqAS IS\(aq\(aq AND ANY
++EXPRESS
++OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
++LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
++OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
++EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++.SH "AUTHOR"
++.PP
++MaraDNS is written by Sam Trenholme. Jaakko Niemi used 5 minutes
++to roll this manpage together, which Sam has subsequently revised.
++
diff --git a/net-dns/maradns/files/maradns-2.0.06-duende-man.patch b/net-dns/maradns/files/maradns-2.0.06-duende-man.patch
new file mode 100644
index 000000000000..8e9283bc0802
--- /dev/null
+++ b/net-dns/maradns/files/maradns-2.0.06-duende-man.patch
@@ -0,0 +1,109 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: Duende man page
+ We have made various changes to the duende executable and these need to
+ be reflected in the Debian man page.
+Forwarded: yes
+Last-Update: 2011-07-18
+--- a/doc/en/man/duende.8
++++ b/doc/en/man/duende.8
+@@ -29,11 +29,12 @@
+ makes a given child process a daemon. The standard output
+ and standard error
+ of the child process is logged via syslog() with a priority of
+-LOG_INFO.
++LOG_ALERT.
+ .SH "USAGE"
+ .PP
+ .B "duende"
+-child_process [ all subsequent arguments passed on to child ]
++.RB [ options ]
++child_process [ arguments passed onto child ]
+ .SH "DETAILS"
+ .PP
+ When
+@@ -76,48 +77,52 @@
+ duende uses a setuid() call to change the user ID of the logging
+ process
+ to the user with ID 66.
++.SH "OPTIONS"
++.PP
++Most of the above behaviour can be configured by command line arguments.
++.TP 4
++.BI -c | --chroot " directory"
++The log helper process will change its directory and root to this location.
++This defaults to
++.B /etc/maradns/logger "."
++.TP 4
++.BI -i | --ident " string"
++The log helper process will use this string to identify the process when
++sending messages to syslog.
++This defaults to
++.B log-help "."
++.TP 4
++.BI -p | --pid " filename"
++If this argument is present, the duende parent process will store its pid in
++this file.
++.TP 4
++.BI -u | --uid " integer"
++The log helper process will drop its user id to this. This value defaults to
++66.
++.TP 4
++.BI -g | --gid " integer"
++The log helper process will drop its group id to this. This value defaults to
++66.
++.TP 4
++.BI -r | --restart_on " integer"
++The log helper process will restart the child process if it exists with this
++status code. This defaults to 8.
+ .SH "LOGGING"
+ .PP
+ .B "duende"
+ uses the syslog() facility to log the standard output of the
+ program that it invokes. The name of the program (in other words, the
+-"ident" given to openlog()) is the full path of the first argument
+-given
+-to
+-.BR "duende" "."
++"ident" given to openlog()) defaults to
++.BR "log-helper"
++but can be overridden with the
++.RB "--ident"
++argument.
+ All messages created by the child process are sent
+-to syslog() with a priority of LOG_INFO and a "facility"
+-of LOG_DAEMON (daemon.info in /etc/syslog.conf); since daemon.info
+-messages are not logged by default in FreeBSD, on FreeBSD systems
+-messages generated by the child process are logged with a priority of
+-LOG_ALERT and a "facility" of LOG_DAEMON (daemon.alert in
+-/etc/syslog.conf).
++to syslog() with a priority of LOG_ALERT and a "facility"
++of LOG_DAEMON (daemon.info in /etc/syslog.conf).
+ Should duende itself encounter an error, it will send
+ messages to syslog() with a priority of LOG_ALERT.
+ .PP
+-For example, suppose one invokes duende thusly:
+-
+-.nf
+-	duende /usr/local/sbin/maradns
+-.fi
+-
+-If invoked thusly, duende will log all messages with the "ident"
+-(program
+-name) of "/usr/local/sbin/maradns". If this is not desired, invoke
+-duende
+-with something like:
+-
+-.nf
+-	export PATH=$PATH:/usr/local/sbin
+-	duende maradns
+-.fi
+-
+-This will log messages with a (more sensible) "ident" of maradns.
+-.PP
+-Note: If a non-POSIX Bourne shell (such as csh, es, rc, or fish) is
+-used to
+-invoke MaraDNS, the above syntax needs to be changed.
+-.PP
+ Also, the directory /etc/maradns/logger, while used by duende, is not
+ used
+ to store any log messages. That is unless, for some reason, one
diff --git a/net-dns/maradns/files/maradns-2.0.06-groff.patch b/net-dns/maradns/files/maradns-2.0.06-groff.patch
new file mode 100644
index 000000000000..348c1eaf8208
--- /dev/null
+++ b/net-dns/maradns/files/maradns-2.0.06-groff.patch
@@ -0,0 +1,443 @@
+Author: Nicholas Bamber <nicholas@periapt.co.uk>
+Subject: Fix error in the man pages
+ This is really ugly. The man pages are generated by a custom text processing
+ system from filesin the doc/en/source directory. Therefore really this
+ needs to be fixed in the upstream 'ej' utility. It would be better to patch
+ that and submit that patch upstream.
+Last-Update: 2012-02-12
+Forwarded: no
+--- a/doc/en/man/askmara.1
++++ b/doc/en/man/askmara.1
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-askmara - do simple dns queries
++askmara \- do simple dns queries
+ .SH "DESCRIPTION"
+ .PP
+ .B "askmara"
+@@ -35,24 +35,29 @@
+ .SH "USAGE"
+ .PP
+ .B "askmara"
+-[-n] [ -v | -t timeout] query [ server ]
++.RB [ -n ]
++.RB [ -v | -t
++.IR timeout ]
++.I query
++.RI [ server ]
+ .SH "OPTIONS"
+ .PP
+ .TP 4
+--t
+-If this is present, the following argument is the askmara timeout, in
+-seconds. Note that
++.BI -t
++If this is present, the following argument is the askmara
++.IR timeout ,
++in seconds. Note that
+ .B "askmara"
+ can not both have a user-defined
+ timeout and verbose output.
+ .TP 4
+--v
++.BI -v
+ If this is set,
+ .B "askmara"
+ will verbosely output the complete reply that the server sent. Note
+ that this verbose output is not csv2-compatible.
+ .TP 4
+--n
++.BI -n
+ If this is set,
+ .BR "askmara" ","
+ when sending out a query, will not
+@@ -60,7 +65,7 @@
+ remote DNS server not contact other DNS servers to answer the query in
+ question.
+ .TP 4
+-query
++.I query
+ dns record to be queried. The query has two sections:
+ The type of record we desire, and the hostname we want this record for.
+ .PP
+@@ -102,7 +107,7 @@
+ .B "Z"
+ signifies that we want to ask for all RRs.
+ .TP 4
+-server
++.I server
+ IP address of the dns server to be queried. If no server is given,
+ askmara will query 127.0.0.1.
+ .PP
+--- a/doc/en/man/bind2csv2.1
++++ b/doc/en/man/bind2csv2.1
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-bind2csv2.py - convert zone files from BIND to MaraDNS compatible
++bind2csv2.py \- convert zone files from BIND to MaraDNS compatible
+ format
+ .SH "DESCRPTION"
+ .PP
+@@ -56,7 +56,7 @@
+ zone files, and invoke the script thusly:
+ 
+ .nf
+-bind2csv2.py -c zone1 zone2 zone3
++.BI "bind2csv2.py -c" " zone1 zone2 zone3"
+ .fi
+ 
+ Substitute "zone1", "zone2", and "zone3" with a list of one or more
+--- a/doc/en/man/mqhash.1
++++ b/doc/en/man/mqhash.1
+@@ -22,10 +22,14 @@
+ 
+ .SH "NAME"
+ .PP
+-mqhash - Simple secure password generator
++mqhash \- Simple secure password generator
+ .SH "SYNOPSIS"
+ .PP
+-.B "mqhash [-n #] [-s] [-u] {data to hash}"
++.B mqhash
++.RB [ "-n #" ]
++.RB [ -s ]
++.RB [ -u ]
++.I {data to hash}
+ .SH "DESCRIPTION"
+ .PP
+ .B "mqhash"
+@@ -57,15 +61,17 @@
+ Once the ~/.mhash_prefix file is set up, mqhash is run thusly:
+ 
+ .nf
+-mqhash -s {location}
++.BI "mqhash -s " location
+ .fi
+ 
+-Where {location} is a web site, email address, or any other text string
++Where
++.I location
++is a web site, email address, or any other text string
+ that describes where a given password is located. It is recommended
+-that
+-one uses a consistent style for {location} so that one can remember
+-passwords for web sites that one has not visited for a while.
+-Mqhash does not impose a style for remembering passwords; it is up
++that one uses a consistent style for
++.I location
++so that one can remember passwords for web sites that one has not visited for
++a while. Mqhash does not impose a style for remembering passwords; it is up
+ to the user to create one.
+ .PP
+ .B "mqhash"
+--- a/doc/en/man/fetchzone.1
++++ b/doc/en/man/fetchzone.1
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-fetchzone - get dns zone from server
++fetchzone \- get dns zone from server
+ .SH "DESCRIPTION"
+ .PP
+ .B "fetchzone"
+@@ -31,7 +31,8 @@
+ .SH "USAGE"
+ .PP
+ .B "fetchzone"
+-zone_name zone_server_IP [query_class]
++.I zone_name zone_server_IP
++.RI [ query_class ]
+ .SH "OPTIONS"
+ .PP
+ .B "zone_name"
+--- a/doc/en/man/getzone.1
++++ b/doc/en/man/getzone.1
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-getzone - get dns zone from server
++getzone \- get dns zone from server
+ .SH "DESCRIPTION"
+ .PP
+ .B "getzone"
+@@ -34,19 +34,20 @@
+ .SH "USAGE"
+ .PP
+ .B "getzone"
+-zone_name zone_server_IP [query_class]
++.I zone_name zone_server_IP
++.RI [ query_class ]
+ .SH "OPTIONS"
+ .PP
+-.B "zone_name"
+-.PP
++.TP 4
++.I "zone_name"
+ Name of the dns zone to be transferred.
+ .PP
+-.B "zone_server_IP"
+-.PP
++.TP 4
++.I "zone_server_IP"
+ IP address of dns server
+ .PP
+-.B "query_class"
+-.PP
++.TP 4
++.I "query_class"
+ Optional argument which can change the query class from 1 (the
+ default) to 255. This may be needed for some versions of Bind.
+ .SH "EXAMPLES"
+--- a/doc/en/man/maradns.8
++++ b/doc/en/man/maradns.8
+@@ -165,7 +165,7 @@
+ cryptic error message.
+ .PP
+ 10. After I start MaraDNS, I can not see the process
+-when I run netstat -na
++when I run netstat \-na
+ .PP
+ 11. What string library does MaraDNS use?
+ .PP
+@@ -439,7 +439,7 @@
+ .PP
+ .in -3
+ \fB10. After I start MaraDNS, I can not see the process when I run
+-netstat -na \fR
++netstat \-na \fR
+ .PP
+ Udp services do not have a prominent "LISTEN" when netstat is run.
+ .PP
+@@ -447,7 +447,7 @@
+ like this:
+ udp 0 0 127.0.0.1:53 0.0.0.0:*
+ .PP
+-While on the topic of netstat, if you run netstat -nap as root
++While on the topic of netstat, if you run netstat \-nap as root
+ on Linux and some other *nix operating systems, you can see the names
+ of
+ the processes which are providing internet services.
+@@ -532,7 +532,7 @@
+ *
+ After editing, do something like this:
+ .br
+-diff -u MaraDNS.c.orig MaraDNS.c > maradns.patch
++diff \-u MaraDNS.c.orig MaraDNS.c > maradns.patch
+ .TP 2
+ *
+ Make sure the modified version compiles cleanly
+@@ -791,12 +791,12 @@
+ will work in MaraDNS csv2 zone files as long as the double quotes (")
+ are
+ replaced by single quotes (\(aq). For example, a SPF TXT record that
+-looks like example.net. IN TXT "v=spf1 +mx a:colo.example.com/28 -all"
++looks like example.net. IN TXT "v=spf1 +mx a:colo.example.com/28 \-all"
+ in a BIND zone file will look like
+-example.net. TXT \(aqv=spf1 +mx a:colo.example.com/28 -all\(aq in a
++example.net. TXT \(aqv=spf1 +mx a:colo.example.com/28 \-all\(aq in a
+ MaraDNS zone file. MaraDNS version 1.2.08 and higher can also make
+ the corresponding SPF record, which will have the syntax
+-example.net. SPF \(aqv=spf1 +mx a:colo.example.com/28 -all\(aq.
++example.net. SPF \(aqv=spf1 +mx a:colo.example.com/28 \-all\(aq.
+ .PP
+ .in -3
+ \fB30. I\(aqm having problems resolving CNAMES I have set up.\fR
+@@ -999,7 +999,7 @@
+ .TP 2
+ *
+ Change (or create) that line to look something like FLAGS=-O3
+-In this example, MaraDNS is compiled with the -O3 option.
++In this example, MaraDNS is compiled with the \-O3 option.
+ .TP 2
+ *
+ Note that it is important to
+@@ -1010,7 +1010,7 @@
+ FLAGS=-O2&nbsp;-Wall&nbsp;-DSELECT_PROBLEM and you want to compile
+ at optimization level three, change this line to look like
+ FLAGS=-O2&nbsp;-Wall&nbsp;-DSELECT_PROBLEM retaining the flags
+-added by the configuration script. -DSELECT_PROBLEM for example,
++added by the configuration script. \-DSELECT_PROBLEM for example,
+ is needed in the Linux compile or MaraDNS will have problems with
+ freezing up.
+ .PP
+@@ -1149,7 +1149,7 @@
+ *
+ It is necessary to have recursion disabled, if using MaraDNS 1.4,
+ either
+-by compiling MaraDNS without recursive support (./configure --authonly
++by compiling MaraDNS without recursive support (./configure \-\-authonly
+ ; make),
+ or by making sure MaraDNS does not have recursion enabled (by not
+ having
+--- a/doc/en/man/zoneserver.8
++++ b/doc/en/man/zoneserver.8
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-zoneserver - handle zone transfers and other TCP functions for MaraDNS
++zoneserver \- handle zone transfers and other TCP functions for MaraDNS
+ .SH "DESCRIPTION"
+ .PP
+ .B "zoneserver"
+@@ -34,12 +34,12 @@
+ by default, to determine its parameters.
+ .SH "USAGE"
+ .PP
+-.B "zoneserver -f"
+-pointer_to_mararc_file
++.B zoneserver -f
++.I pointer_to_mararc_file
+ .SH "OPTIONS"
+ .PP
+ .TP 4
+--f
++.B -f
+ Specifies the location of the configuration file. MaraDNS uses the same
+ configuration file for both the main dns server and the zoneserver.
+ .PP
+--- a/doc/en/man/mararc.5
++++ b/doc/en/man/mararc.5
+@@ -109,7 +109,7 @@
+ initializing.
+ .SH "DICTIONARY VARIABLES"
+ .PP
+-Here is a listing of all "dictionary"-style variables that MaraDNS
++Here is a listing of all "dictionary"\-style variables that MaraDNS
+ uses:
+ .PP
+ .in -3
+--- a/doc/en/man/csv2_txt.5
++++ b/doc/en/man/csv2_txt.5
+@@ -169,13 +169,13 @@
+ Literal single quotes can be placed in resource records:
+ 
+ .nf
+-h.example.com. TXT \(aqperl -e \(aq\\\(aq\(aqprint "A Perl of a TXT record!\\n"\(aq\\\(aq ~
++h.example.com. TXT \(aqperl \-e \(aq\\\(aq\(aqprint "A Perl of a TXT record!\\n"\(aq\\\(aq ~
+ .fi
+ 
+ The above example produces this record:
+ 
+ .nf
+-perl -e \(aqprint "A Perl of a TXT record!\\n"\(aq ~
++perl \-e \(aqprint "A Perl of a TXT record!\\n"\(aq ~
+ .fi
+ 
+ To render the \(aq~\(aq character, use the escape sequence \\x7e
+--- a/doc/en/man/csv2.5
++++ b/doc/en/man/csv2.5
+@@ -874,7 +874,7 @@
+ 
+ # Starting with MaraDNS 1.2.08, there is also support for SPF records,
+ # which are identical to TXT records.  See RFC4408 for more details.
+-example.net.    spf \(aqv=spf1 +mx a:colo.example.com/28 -all\(aq ~
++example.net.    spf \(aqv=spf1 +mx a:colo.example.com/28 \-all\(aq ~
+ 
+ 
+ 
+--- a/doc/en/man/duende.8
++++ b/doc/en/man/duende.8
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-duende - run a child process as a daemon
++duende \- run a child process as a daemon
+ .SH "DESCRIPTION"
+ .PP
+ .B "duende"
+@@ -126,16 +126,16 @@
+ .PP
+ Using duende to start maradns, where the mararc file is /etc/mararc.2
+ 
+-.nf
+-	duende maradns -f /etc/mararc.2
+-.fi
++.B duende maradns
++.RB -f
++.IR /etc/mararc.2
+ 
+ Using duende to start zoneserver, where the mararc file is
+ /etc/mararc.4
+ 
+-.nf
+-	duende zoneserver -f /etc/mararc.4
+-.fi
++.B duende zoneserver
++.RB -f
++.IR /etc/mararc.4
+ 
+ .SH "BUGS"
+ .PP
+--- a/deadwood-3.2.01/doc/Deadwood.1
++++ b/deadwood-3.2.01/doc/Deadwood.1
+@@ -22,7 +22,7 @@
+ 
+ .SH "NAME"
+ .PP
+-Deadwood - A fully recursive caching DNS resolver
++deadwood \- A fully recursive caching DNS resolver
+ .SH "DESCRIPTION"
+ .PP
+ Deadwood is a fully recursive DNS cache. This is a DNS server with
+@@ -66,16 +66,16 @@
+ .SH "COMMAND LINE ARGUMENTS"
+ .PP
+ Deadwood has a single optional command line argument: The location
+-of the configuration file that Deadwood uses, specified with the "-f"
++of the configuration file that Deadwood uses, specified with the "\-f"
+ flag.
+ If this is not defined, Deadwood uses the file "/etc/dwood3rc" as the
+ configuration file.
+ .PP
+ In other words, invoking Deadwood as
+-.B "Deadwood"
++.B "deadwood"
+ will cause Deadwood to
+ use /etc/dwood3rc as the configuration file; invoking Deadwood as
+-.B "Deadwood -f foobar"
++.B "deadwood -f foobar"
+ will cause Deadwood to use the file "foobar"
+ in the current working directory (the directory one is in when
+ starting Deadwood) as the configuration file.
+@@ -671,7 +671,7 @@
+ If there is a parse error in the file pointed to by execfile, Deadwood
+ will report the error as being on the line with the execfile command in
+ the main dwood3rc file. To find where a parse error is in the sub-file,
+-use something like "Deadwood -f /etc/deadwood/execfile/filename"
++use something like "Deadwood \-f /etc/deadwood/execfile/filename"
+ to find the parse error in the offending file, where "filename" is the
+ file
+ to to parsed via execfile.
+@@ -685,7 +685,7 @@
+ support:
+ 
+ .nf
+-	export FLAGS=\(aq-Os -DIPV6\(aq
++	export FLAGS=\(aq-Os \-DIPV6\(aq
+ 	make
+ .fi
+ 
+@@ -832,7 +832,7 @@
+ It is not clear whether the DNS RFCs allow ASCII control characters
+ in DNS names. Even if they were, Deadwood does not allow ASCII
+ control characters (bytes with a value less then 32) in DNS names.
+-Other characters (UTF-8, etc.) are allowed.
++Other characters (UTF\-8, etc.) are allowed.
+ .SH "LEGAL DISCLAIMER"
+ .PP
+ THIS SOFTWARE IS PROVIDED BY THE AUTHORS \(aq\(aqAS IS\(aq\(aq AND ANY
+@@ -851,5 +851,5 @@
+ .PP
+ Sam Trenholme (http://www.samiam.org) is
+ responsible for this program and man page. He appreciates all of
+-Jean-Jacques Sarton\(aqs help giving this program IPv6 support.
++Jean\-Jacques Sarton\(aqs help giving this program IPv6 support.
+ 
diff --git a/net-dns/maradns/files/maradns.rc6 b/net-dns/maradns/files/maradns.rc6
index e4c8ba2a1afd..44e902e770a6 100644
--- a/net-dns/maradns/files/maradns.rc6
+++ b/net-dns/maradns/files/maradns.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.5 2010/07/29 00:16:04 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.6 2012/03/12 12:24:49 kumba Exp $
 
 depend() {
 	need net
diff --git a/net-dns/maradns/files/maradns2 b/net-dns/maradns/files/maradns2
new file mode 100644
index 000000000000..f43166729c08
--- /dev/null
+++ b/net-dns/maradns/files/maradns2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns2,v 1.1 2012/03/12 12:24:50 kumba Exp $
+
+depend() {
+	need net
+	provide dns
+}
+
+start() {
+	ebegin "Starting maradns"
+	start-stop-daemon --start --quiet --name maradns --wait 1000 \
+		--exec /usr/bin/duende /usr/sbin/maradns -- -f /etc/maradns/mararc
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping maradns"
+	start-stop-daemon --stop --quiet --name maradns --wait 1000 \
+		--exec /usr/bin/duende
+	eend $?
+}
diff --git a/net-dns/maradns/files/zoneserver.rc6 b/net-dns/maradns/files/zoneserver.rc6
index df4cc3cefdfb..dc433de82a5b 100644
--- a/net-dns/maradns/files/zoneserver.rc6
+++ b/net-dns/maradns/files/zoneserver.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/zoneserver.rc6,v 1.3 2008/01/06 03:10:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/zoneserver.rc6,v 1.4 2012/03/12 12:24:49 kumba Exp $
 
 depend() {
 	need net
diff --git a/net-dns/maradns/files/zoneserver2 b/net-dns/maradns/files/zoneserver2
new file mode 100644
index 000000000000..57fca024a93c
--- /dev/null
+++ b/net-dns/maradns/files/zoneserver2
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/zoneserver2,v 1.1 2012/03/12 12:24:50 kumba Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting zoneserver"
+	start-stop-daemon --start --quiet --name zoneserver --wait 1000 \
+		--exec /usr/bin/duende /usr/sbin/zoneserver -- -f /etc/maradns/mararc
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping zoneserver"
+	start-stop-daemon --stop --quiet --name zoneserver --wait 1000 \
+		--exec /usr/bin/duende
+	eend $?
+}
diff --git a/net-dns/maradns/maradns-1.4.06.ebuild b/net-dns/maradns/maradns-1.4.11.ebuild
index b83b198155c4..f0c53edefa4e 100644
--- a/net-dns/maradns/maradns-1.4.06.ebuild
+++ b/net-dns/maradns/maradns-1.4.11.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.06.ebuild,v 1.7 2012/01/14 18:31:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.11.ebuild,v 1.1 2012/03/12 12:24:50 kumba Exp $
 
-EAPI="2"
+EAPI="4"
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Proxy DNS server with permanent caching"
+DESCRIPTION="A security-aware DNS server"
 HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/1.4/${PV}/${P}.tar.bz2"
+SRC_URI="http://www.maradns.org/download/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="authonly"
 
 DEPEND="dev-lang/perl"
+RDEPEND=""
 
 src_prepare() {
 	sed -i \
diff --git a/net-dns/maradns/maradns-2.0.06.ebuild b/net-dns/maradns/maradns-2.0.06.ebuild
new file mode 100644
index 000000000000..80d4291b6ff2
--- /dev/null
+++ b/net-dns/maradns/maradns-2.0.06.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-2.0.06.ebuild,v 1.1 2012/03/12 12:24:50 kumba Exp $
+
+EAPI="4"
+inherit eutils toolchain-funcs flag-o-matic
+
+DEADWOOD_VER="3.2.02"
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="http://www.maradns.org/"
+SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~mips"
+IUSE="authonly ipv6"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	local myflags
+
+	# Apply some minor patches from Debian.
+	epatch "${FILESDIR}"/${P}-askmara-tcp.patch
+	epatch "${FILESDIR}"/${P}-duende-man.patch
+
+	# In order for Deadwood to build correctly, it needs to know where
+	# clock_getttime is at, and on Linux/glibc, this is in librt.
+	# Hopefully, other systems won't have issues.
+	use elibc_glibc && myflags="-lrt"
+
+	# Honor system CFLAGS.
+	# Need to append -lrt to build Deadwood properly.
+	sed -i \
+		-e "s:FLAGS=-O2:\$(M):g" \
+		-e "s:-O2:\$(CFLAGS) \$(LDFLAGS) ${myflags}:" \
+		-e "s:\$(CC):$(tc-getCC):g" \
+		-e "s:make:\$(MAKE):g" \
+		build/Makefile.linux || die
+}
+
+src_configure() {
+	local myconf
+
+	# Use duende-ng.c.
+	cp  "${S}/tools/duende-ng.c" "${S}/tools/duende.c"
+
+	use ipv6 && myconf="${myconf} --ipv6"
+	./configure ${myconf} || die "Failed to configure ${PN}."
+}
+
+src_compile() {
+	make ${MAKEOPTS} || die "Filed to compile ${PN}."
+
+	# On linux/glibc, we forced -lrt into the build flags to make sure
+	# that clock_getttime() was found in the correct library.  But to
+	# catch this error on other platforms, we'll see if DwSys.o is
+	# present, which indicates a successful build or not.
+	[[ ! -f "${S}/deadwood-${DEADWOOD_VER}/src/DwSys.o" ]]	\
+		&& die "Deadwood failed to build, possibly due to a "	\
+		       "missing reference to clock_gettime.  Please "	\
+		       "report this in a bug!"
+}
+
+src_install() {
+	# Install the MaraDNS binaries.
+	dosbin server/maradns
+	dosbin tcp/zoneserver
+	dobin tcp/getzone tcp/fetchzone
+	dobin tools/askmara tools/askmara-tcp tools/duende
+	dobin tools/bind2csv2.py tools/csv1tocsv2.pl
+
+	# MaraDNS docs, manpages, misc.
+	dodoc doc/en/{QuickStart,README,*.txt}
+	dodoc doc/en/text/*.txt
+	doman doc/en/man/*.[1-9]
+	dodoc maradns.gpg.key
+	dohtml doc/en/*.html
+	dohtml -r doc/en/webpage
+	dohtml -r doc/en/tutorial
+	docinto examples
+	dodoc doc/en/examples/example_*
+
+	# Deadwood binary, docs, manpages, etc.
+	if ! use authonly; then
+		dosbin deadwood-${DEADWOOD_VER}/src/Deadwood
+		doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
+		docinto deadwood
+		dodoc deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende,FAQ}.txt
+		dohtml deadwood-${DEADWOOD_VER}/doc/{Deadwood,FAQ}.html
+		docinto deadwood/internals
+		dodoc deadwood-${DEADWOOD_VER}/doc/internals/*
+		insinto /etc/maradns
+		newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
+	fi
+
+	# Example configurations.
+	insinto /etc/maradns
+	newins doc/en/examples/example_full_mararc mararc_full.dist
+	newins doc/en/examples/example_csv2 example_csv2.dist
+	keepdir /etc/maradns/logger
+
+	# Init scripts.
+	newinitd "${FILESDIR}"/maradns2 maradns
+	newinitd "${FILESDIR}"/zoneserver2 zoneserver
+	if ! use authonly; then
+		newinitd "${FILESDIR}"/deadwood deadwood
+	fi
+}
+
+pkg_postinst() {
+	enewgroup maradns 99
+	enewuser duende 66 -1 -1 maradns
+	enewuser maradns 99 -1 -1 maradns
+}