Fixed #192328 and #204351.

(Portage version: 2.1.3.19)

7 files changed, 137 insertions, 6 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index 5405bc93bd95..b45b8ba567f0 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/maradns
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.19 2007/06/09 14:20:54 dertobi123 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.20 2008/01/06 03:10:36 matsuu Exp $
+
+*maradns-1.3.07.08 (06 Jan 2008)
+*maradns-1.2.12.09 (06 Jan 2008)
+
+  06 Jan 2008; MATSUU Takuto <matsuu@gentoo.org> files/maradns.rc6,
+  files/zoneserver.rc6, +maradns-1.2.12.09.ebuild,
+  +maradns-1.3.07.08.ebuild:
+  Version bumped. bug #204351.
+  Fixed init.d/*, bug #192328.
 
   09 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   maradns-1.2.12.06.ebuild:
diff --git a/net-dns/maradns/files/digest-maradns-1.2.12.09 b/net-dns/maradns/files/digest-maradns-1.2.12.09
new file mode 100644
index 000000000000..66caa4dd97b4
--- /dev/null
+++ b/net-dns/maradns/files/digest-maradns-1.2.12.09
@@ -0,0 +1,3 @@
+MD5 ee82cb6d4989cee2b9937257dc48c025 maradns-1.2.12.09.tar.bz2 1068755
+RMD160 47b4816d125883d0a7d676677102fc906546f2f8 maradns-1.2.12.09.tar.bz2 1068755
+SHA256 13544b70cc5e890258a950396a558d1a37b4b650c6feff84cd6e6ff83640262b maradns-1.2.12.09.tar.bz2 1068755
diff --git a/net-dns/maradns/files/digest-maradns-1.3.07.08 b/net-dns/maradns/files/digest-maradns-1.3.07.08
new file mode 100644
index 000000000000..1f1106ab4e58
--- /dev/null
+++ b/net-dns/maradns/files/digest-maradns-1.3.07.08
@@ -0,0 +1,3 @@
+MD5 d44d7e1309c7c05654e62b52c6ab6822 maradns-1.3.07.08.tar.bz2 963630
+RMD160 1855689b62ed3f676e230a344db56c8b24961324 maradns-1.3.07.08.tar.bz2 963630
+SHA256 433657f20acd2431ca9b780095eb36b296e9703de879d04c8f3f4473673db2bf maradns-1.3.07.08.tar.bz2 963630
diff --git a/net-dns/maradns/files/maradns.rc6 b/net-dns/maradns/files/maradns.rc6
index f93ad5587f9a..63fead5d7254 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
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.3 2006/12/03 03:46:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.4 2008/01/06 03:10:37 matsuu Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting maradns"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start --quiet --name maradns \
 		--exec /usr/bin/duende /usr/sbin/maradns
 	eend $?
 }
diff --git a/net-dns/maradns/files/zoneserver.rc6 b/net-dns/maradns/files/zoneserver.rc6
index b2fe8fe3da2a..df4cc3cefdfb 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
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/zoneserver.rc6,v 1.2 2006/12/03 03:46:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/zoneserver.rc6,v 1.3 2008/01/06 03:10:37 matsuu Exp $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting zoneserver"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start --quiet --name zoneserver \
 		--exec /usr/bin/duende /usr/sbin/zoneserver
 	eend $?
 }
diff --git a/net-dns/maradns/maradns-1.2.12.09.ebuild b/net-dns/maradns/maradns-1.2.12.09.ebuild
new file mode 100644
index 000000000000..3bb8eb30e2ad
--- /dev/null
+++ b/net-dns/maradns/maradns-1.2.12.09.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.2.12.09.ebuild,v 1.1 2008/01/06 03:10:36 matsuu Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.maradns.org/"
+SRC_URI="mirror://sourceforge/maradns/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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}:" build/Makefile.linux || die
+}
+
+src_compile() {
+	./configure || die
+	emake CC="$(tc-getCC)" || die "compile problem"
+}
+
+src_install() {
+	dosbin server/maradns
+	# use authonly && newsbin server/maradns.authonly maradns
+	dosbin tcp/zoneserver
+
+	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende
+
+	doman doc/en/man/*.[1-9]
+
+	dodoc maradns.gpg.key
+	dodoc doc/en/{QuickStart,README,*.txt}
+	dohtml doc/en/*.html
+	dohtml -r doc/en/webpage
+	docinto examples; dodoc doc/en/examples/example_*
+
+	insinto /etc; newins doc/en/examples/example_mararc mararc
+	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net
+	keepdir /etc/maradns/logger
+
+	newinitd "${FILESDIR}"/maradns.rc6 maradns
+	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver
+}
+
+pkg_postinst() {
+	enewuser maradns 99 -1 /var/empty daemon
+}
diff --git a/net-dns/maradns/maradns-1.3.07.08.ebuild b/net-dns/maradns/maradns-1.3.07.08.ebuild
new file mode 100644
index 000000000000..9b408d599dd4
--- /dev/null
+++ b/net-dns/maradns/maradns-1.3.07.08.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.3.07.08.ebuild,v 1.1 2008/01/06 03:10:36 matsuu Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.maradns.org/"
+SRC_URI="http://www.maradns.org/download/1.3/${PV}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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}:" build/Makefile.linux || die
+}
+
+src_compile() {
+	./configure || die
+	emake CC="$(tc-getCC)" || die "compile problem"
+}
+
+src_install() {
+	dosbin server/maradns
+	# use authonly && newsbin server/maradns.authonly maradns
+	dosbin tcp/zoneserver
+
+	dobin tcp/getzone tcp/fetchzone tools/askmara tools/duende
+
+	doman doc/en/man/*.[1-9]
+
+	dodoc maradns.gpg.key
+	dodoc doc/en/{QuickStart,README,*.txt}
+	dohtml doc/en/*.html
+	dohtml -r doc/en/webpage
+	docinto examples; dodoc doc/en/examples/example_*
+
+	insinto /etc; newins doc/en/examples/example_mararc mararc
+	insinto /etc/maradns; newins doc/en/examples/example_csv2 db.example.net
+	keepdir /etc/maradns/logger
+
+	newinitd "${FILESDIR}"/maradns.rc6 maradns
+	newinitd "${FILESDIR}"/zoneserver.rc6 zoneserver
+}
+
+pkg_postinst() {
+	enewuser maradns 99 -1 /var/empty daemon
+}