Security cleanup, wrt bug #501686

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 6 insertions, 677 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index 359bc5f4f59e..002f9dda4f49 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/maradns
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.62 2014/02/28 09:54:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.63 2014/02/28 09:57:10 pinkbyte Exp $
+
+  28 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> -maradns-1.4.12.ebuild,
+  -maradns-2.0.06.ebuild, -files/maradns-2.0.06-build.patch,
+  -files/maradns-2.0.06-groff.patch:
+  Security cleanup, wrt bug #501686
 
   28 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> maradns-1.4.14.ebuild,
   maradns-2.0.09.ebuild:
diff --git a/net-dns/maradns/files/maradns-2.0.06-build.patch b/net-dns/maradns/files/maradns-2.0.06-build.patch
deleted file mode 100644
index 4a358b61a5d6..000000000000
--- a/net-dns/maradns/files/maradns-2.0.06-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: maradns-2.0.06/build/Makefile.linux
-===================================================================
---- maradns-2.0.06.orig/build/Makefile.linux
-+++ maradns-2.0.06/build/Makefile.linux
-@@ -10,7 +10,7 @@ POBJECTS=parse/ParseMaraRc.o parse/Parse
- DOBJECTS=dns/Queries.o dns/Compress.o dns/bobbit.o
- # Secure random number generator objects
- ROBJECTS=rng/rng-api-fst.o rng/rng-alg-fst.o
--OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS)
-+OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS) -lrt
- EXECS=server/maradns
- 
- # Uncomment the following three lines to get this to compile on Solaris
-@@ -28,19 +28,21 @@ Q="DEFINES=-DSELECT_PROBLEM"
- 
- # Debug
- 
--FLAGS = -O2 -Wall -DSELECT_PROBLEM
-+FLAGS=$(CFLAGS) $(LDFLAGS) -Wall -DSELECT_PROBLEM
- M="CC=$(CC) $(FLAGS)"
- D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
- #FLAGS = -g
- 
- all: 
--	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
--	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
--	cd ../qual ; make $(M) ; cd ../server ; \
--	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
--	cd ../tools ; make $(M) ; \
--	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
--	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
-+	$(MAKE) -C libs $(M)
-+	$(MAKE) -C dns $(M)
-+	$(MAKE) -C rng $(M)
-+	$(MAKE) -C parse $(M)
-+	$(MAKE_ -C qual $(M)
-+	$(MAKE) -C server $(M) $(V) COMPILED=\"$(COMPILED)\"
-+	$(MAKE) -C tools $(M)
-+	$(MAKE) -C deadwood-*/src $(M)
-+	$(MAKE) -C tcp $(M) $(V)
- 
- debug: 
- 	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
-Index: maradns-2.0.06/deadwood-3.2.02/src/Makefile.ipv6
-===================================================================
---- maradns-2.0.06.orig/deadwood-3.2.02/src/Makefile.ipv6
-+++ maradns-2.0.06/deadwood-3.2.02/src/Makefile.ipv6
-@@ -86,5 +86,5 @@ Test:		Test.c DwStr.o DwStr.h DwStr_func
- 	$(CC) $(FLAGS) -Wall -o Test Test.c $(OBJS)
- 
- Deadwood:	DwMain.c $(OBJS) DwStr_functions.h version.h
--	$(CC) $(FLAGS) -DIPV6 -Wall -o Deadwood DwMain.c $(OBJS) 
-+	$(CC) $(FLAGS) -DIPV6 -Wall -o Deadwood DwMain.c $(OBJS) -lrt
- 
diff --git a/net-dns/maradns/files/maradns-2.0.06-groff.patch b/net-dns/maradns/files/maradns-2.0.06-groff.patch
deleted file mode 100644
index 348c1eaf8208..000000000000
--- a/net-dns/maradns/files/maradns-2.0.06-groff.patch
+++ /dev/null
@@ -1,443 +0,0 @@
-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/maradns-1.4.12.ebuild b/net-dns/maradns/maradns-1.4.12.ebuild
deleted file mode 100644
index 9dc79981dce1..000000000000
--- a/net-dns/maradns/maradns-1.4.12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.12.ebuild,v 1.5 2012/06/14 02:13:48 zmedico Exp $
-
-EAPI="4"
-inherit toolchain-funcs user
-
-DESCRIPTION="A security-aware DNS server"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="authonly"
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "s:PREFIX/man:PREFIX/share/man:" \
-		-e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
-		build/install.locations || die
-	sed -i \
-		-e "s:-O2:\$(CFLAGS) \$(LDFLAGS):" \
-		-e "s:\$(CC):$(tc-getCC):g" \
-		-e "s:make:\$(MAKE):g" \
-		build/Makefile.linux || die
-	if use authonly ; then
-		sed -e "/provide dns/d" \
-			"${FILESDIR}/maradns.rc6" > "${T}/maradns.rc6" || die
-	else
-		cp "${FILESDIR}/maradns.rc6" "${T}/maradns.rc6" || die
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use authonly ; then
-		myconf="${myconf} --authonly"
-	fi
-	./configure ${myconf} # || die
-}
-
-src_install() {
-	if use authonly ; then
-		newsbin server/maradns.authonly maradns || die
-	else
-		dosbin server/maradns || die
-	fi
-
-	dosbin tcp/zoneserver || die
-
-	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende || die
-
-	doman doc/en/man/*.[1-9] || die
-
-	dodoc maradns.gpg.key || die
-	dodoc doc/en/{QuickStart,README,*.txt} || die
-	dohtml doc/en/*.html || die
-	dohtml -r doc/en/webpage || die
-	docinto examples; dodoc doc/en/examples/example_* || die
-
-	insinto /etc; newins doc/en/examples/example_mararc mararc || die
-	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net || die
-	keepdir /etc/maradns/logger || die
-
-	newinitd "${T}"/maradns.rc6 maradns || die
-	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver || die
-}
-
-pkg_postinst() {
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-}
diff --git a/net-dns/maradns/maradns-2.0.06.ebuild b/net-dns/maradns/maradns-2.0.06.ebuild
deleted file mode 100644
index c8ae48db0929..000000000000
--- a/net-dns/maradns/maradns-2.0.06.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 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.7 2013/08/18 13:45:57 ago Exp $
-
-EAPI="4"
-inherit eutils toolchain-funcs flag-o-matic systemd user
-
-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 ~mips ppc x86"
-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
-
-	# And one from Gentoo
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Use duende-ng.c.
-	cp  "${S}/tools/duende-ng.c" "${S}/tools/duende.c"
-
-	tc-export CC
-
-	use ipv6 && myconf="${myconf} --ipv6"
-	./configure ${myconf} || die "Failed to configure ${PN}."
-}
-
-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
-
-	# systemd unit
-	# please keep paths in sync!
-	sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
-		-e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
-		"${FILESDIR}"/maradns.service.in > "${T}"/maradns.service
-	systemd_dounit "${T}"/maradns.service
-}
-
-pkg_postinst() {
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-}