Version bumped, bug #307917, #329947. Fixed init.d handling, bug #217790. Fixed CFLAGS issue, bug #240884.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

7 files changed, 112 insertions, 184 deletions

diff --git a/net-dns/maradns/ChangeLog b/net-dns/maradns/ChangeLog
index 229e6d2a9e70..0bd4da1b79f0 100644
--- a/net-dns/maradns/ChangeLog
+++ b/net-dns/maradns/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dns/maradns
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.30 2010/04/11 12:18:49 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/ChangeLog,v 1.31 2010/07/29 00:16:04 matsuu Exp $
+
+*maradns-1.4.03 (29 Jul 2010)
+
+  29 Jul 2010; MATSUU Takuto <matsuu@gentoo.org> -maradns-1.2.12.09.ebuild,
+  -maradns-1.3.07.08.ebuild, -maradns-1.3.07.09.ebuild,
+  +maradns-1.4.03.ebuild, files/maradns.rc6:
+  Version bumped, bug #307917, #329947. Fixed init.d handling, bug #217790.
+  Fixed CFLAGS issue, bug #240884. Removed old versions.
 
   11 Apr 2010; <nixnut@gentoo.org> maradns-1.2.12.10.ebuild:
   ppc stable #270908
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 9fdc35b88eab..98c56aeb74d3 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,13 +1,30 @@
-AUX maradns.rc6 511 RMD160 acae4962d2db150e2891149e04817cb9562c4189 SHA1 86b8bb8faf36ed5172253bb96051f6109dc5cb3b SHA256 71d7d2cb34bf1785c492c233db5c0a0745051074b36252dfdde5713c9a17499a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX maradns.rc6 539 RMD160 8f6731a6c3612923a46d87c4e19e4a8ee9475d9d SHA1 d4aeb8403edb85b36119f93dd9a729401b347ec9 SHA256 860cd10e13a0dc2410c51a6b455103d73befe597de70d56fd0f24510046bce2f
 AUX zoneserver.rc6 516 RMD160 b174116573ccf04ed74d93108169cd1c47258b6e SHA1 f11383b47eca3845cc5372df62aff590d4d0fe11 SHA256 2e35a8a85ab75a386b986da8bfafd3769814b1a032d10ccb3963e1ad22751b8c
-DIST maradns-1.2.12.09.tar.bz2 1068755 RMD160 47b4816d125883d0a7d676677102fc906546f2f8 SHA1 091964ee898d1ee79e35b9e8bb42ae1df5b076e0 SHA256 13544b70cc5e890258a950396a558d1a37b4b650c6feff84cd6e6ff83640262b
 DIST maradns-1.2.12.10.tar.bz2 1062168 RMD160 9692c4bcd2b4fbbfbf48836f70b1c8f778d77c97 SHA1 5695a80146737cd39f5f941522a209423150dadf SHA256 20024f3b7ba77ca6673a9e7e8adaa05cb935ccc870ada97bb0f5e3974e886f72
-DIST maradns-1.3.07.08.tar.bz2 963630 RMD160 1855689b62ed3f676e230a344db56c8b24961324 SHA1 8567a1d952fab8443cc7963d063c520d99a2271a SHA256 433657f20acd2431ca9b780095eb36b296e9703de879d04c8f3f4473673db2bf
 DIST maradns-1.3.07.09.tar.bz2 981498 RMD160 2849d67c8f2d1bfb167974e32cec72046521e303 SHA1 08c63c788933ff31a8721252fb9f0c732ff01b19 SHA256 406f8d1448514a8e3d386b44d7d79c1de7d53e213ad7d14d79ccc71a224f8667
-EBUILD maradns-1.2.12.09.ebuild 1514 RMD160 d2e082279289fd167e0dea062ec76057fd8b9e7e SHA1 712628f053aed67a9bd828040fe069a2c2a81884 SHA256 1379aae83057ed6dd0d8875f8fbff95cb3599abc91e9d867cfc3f64903017d48
+DIST maradns-1.4.03.tar.bz2 987147 RMD160 3c910e45b0d2ddcb8a879141ace51fffd7f95d50 SHA1 3ffd296d6d6ee25206e44f08b6d9bd4845369d81 SHA256 a611b6ac0f3abee62c227b128c1773be4a2a41de75a37ca123d684db33793b23
 EBUILD maradns-1.2.12.10.ebuild 1529 RMD160 077f6a36c7780efdf726cb69dcaf23e84a6850d7 SHA1 08d3389e6d005c4d3507379e100c9d7d7b9531f0 SHA256 36118c86afb24182d092b8c2f653b73e7c2c997b27e09143f8babc69553e9157
-EBUILD maradns-1.3.07.08.ebuild 1533 RMD160 83c8d8e884e0354741fd724a7bdb37f4d647e0ac SHA1 c4041ac65fd6df5d00d05dce4370591a0090b7bb SHA256 85bb1cbe1f22dbd696598e50a8ed9c6a0adff2cf24b8b27277695e835689432c
 EBUILD maradns-1.3.07.09-r1.ebuild 1831 RMD160 90ee260095da86c7c260358ec288c0e179246aa2 SHA1 90a40b82de9d641e7c717583c043a3de6b4c79fc SHA256 a27c9cfed2b7352eeeadd82ffee40335a607f0377c00a7a76b730c0baaf6d17b
-EBUILD maradns-1.3.07.09.ebuild 1533 RMD160 93a3473438f4815582b96a8aa03aa397ff3d6409 SHA1 b7faad9b041a2850b6627342aeb0a3f5b735f3da SHA256 837eca6ac195ce18ebd0af3c84d1720dd9f3e70104a5c19ad9d66896c3a5c79f
-MISC ChangeLog 4388 RMD160 17673ab5cdf309bf0c03b7e9e89397bef925f61f SHA1 57e0a58f4c02c41d55918833725371d86d4c24b7 SHA256 c2ddc2714b29c7a636089c7390197ef71512713fc13cad8d7380e4abaf027e51
+EBUILD maradns-1.4.03.ebuild 1973 RMD160 2f88313a0b8f88830716a116fb45ac577975b856 SHA1 64c86d2a723896cf4797f58cc1405a13a1f35edf SHA256 b7671605530795a3d875619485696900bd2350ce015db2349d104dbbaf942b07
+MISC ChangeLog 4730 RMD160 8f4d018425968b7fcbf39b8a991f43e2e852f43e SHA1 4adf6a5b3a73219dc500040caa6ebbab2bf77701 SHA256 d4d483fa531e3ea56940708db06701f89b01d9513a10f670556f084d34928984
 MISC metadata.xml 316 RMD160 119799ab0c38870ffcc68ba65248fb0352f84dcc SHA1 4d53ecab3f4237e799ba1c44baaa097fcb86671f SHA256 34db6861bf8f606b478bff87cdaf6b0375e5aaf6a743d7039c95be653931c252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMUMjAAAoJECaGw+YFKA1pP9UP/1IDe/INxFAEGEVtz56urGbA
+Qfvvf1Xf/g12Wgx/HrIQTs52NCK6aIFV8RAN1Ijeu57m41C5hlTN7ib2443k3l8L
+QQItkcBWse6kE6hRHuvIBkG+TkEDRAVJGNPrIUs2Y0ZJaZukiGb4QM0GofI/+WJA
+SM9761Ly7eUxB4BVpigJV4NyD6V8E5ZAbKUlbK+Wy8CIX3iJsIeNQFYVGdzGXp92
+RrtS/T9bw7eEQDYTLoKrUMWpkxb8WJN3TBrwnx1gHXJJU5n4enxERAwPo3DExlso
+jOkxznPaL0edWdwCNsPdUeSF52wC0pUrYtBhA1Zmpu6DIeKstLCGPPv8CrKt6nP1
+k2Wsv6Ay3t7FjOkuw+1EZAnU//0phr8j+o06HXK05JkVQNvd3Q4Cgqg4jsMloA5J
+t57/340CfGJwzDr2UcUkdQVRQpo+IK5cG2pEnkY+5+XrFZxlplIt78rMaadIz5Kh
+ms1xrqdoh7XaBh9mctPG6YgPyU85G9cfsvyFFwrIHPhegqUi91jB+gsHsLytIsss
+KlBy0lFtGkBRcYpEj7OgxcHo2+RuX7RxtUylLPnunBd3BewpZw8+W5GsHKxAZy/t
+b3VDeZDlbtajbKgui/M19O8eDmLRzm49ZYBs9IMaoT2RVyD2UN4O1gwWlu6ASWVM
+/P2YJ+qTirrSiM8/4Aqv
+=hM+7
+-----END PGP SIGNATURE-----
diff --git a/net-dns/maradns/files/maradns.rc6 b/net-dns/maradns/files/maradns.rc6
index 63fead5d7254..e4c8ba2a1afd 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.4 2008/01/06 03:10:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/files/maradns.rc6,v 1.5 2010/07/29 00:16:04 matsuu Exp $
 
 depend() {
 	need net
@@ -17,6 +17,7 @@ start() {
 
 stop() {
 	ebegin "Stopping maradns"
-	start-stop-daemon --stop --quiet --name maradns
+	start-stop-daemon --stop --quiet --name maradns \
+		--exec /usr/sbin/duende
 	eend $?
 }
diff --git a/net-dns/maradns/maradns-1.2.12.09.ebuild b/net-dns/maradns/maradns-1.2.12.09.ebuild
deleted file mode 100644
index dde28cc89e9a..000000000000
--- a/net-dns/maradns/maradns-1.2.12.09.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.5 2008/01/16 16:06:31 welp 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
deleted file mode 100644
index 9b408d599dd4..000000000000
--- a/net-dns/maradns/maradns-1.3.07.08.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
-}
diff --git a/net-dns/maradns/maradns-1.3.07.09.ebuild b/net-dns/maradns/maradns-1.3.07.09.ebuild
deleted file mode 100644
index 3cc2cf20b71c..000000000000
--- a/net-dns/maradns/maradns-1.3.07.09.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.09.ebuild,v 1.1 2008/09/15 01:39:11 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
-}
diff --git a/net-dns/maradns/maradns-1.4.03.ebuild b/net-dns/maradns/maradns-1.4.03.ebuild
new file mode 100644
index 000000000000..95ec5fdae34b
--- /dev/null
+++ b/net-dns/maradns/maradns-1.4.03.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/maradns/maradns-1.4.03.ebuild,v 1.1 2010/07/29 00:16:04 matsuu Exp $
+
+EAPI="2"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Proxy DNS server with permanent caching"
+HOMEPAGE="http://www.maradns.org/"
+SRC_URI="http://www.maradns.org/download/1.4/${PV}/${P}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="authonly"
+
+DEPEND="dev-lang/perl"
+
+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):" \
+		-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
+}