Fix duplication of dnstouch, and move binaries to bin, as they are suitable for non-root.

Package-Manager: portage-2.1_rc1-r2

9 files changed, 134 insertions, 8 deletions

diff --git a/net-dns/ndu/ChangeLog b/net-dns/ndu/ChangeLog
index 7036f6fba953..8003ef2d54df 100644
--- a/net-dns/ndu/ChangeLog
+++ b/net-dns/ndu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/ndu
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ChangeLog,v 1.9 2005/12/12 03:42:09 robbat2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ChangeLog,v 1.10 2006/05/22 23:28:07 robbat2 Exp $
+
+*ndu-0.4-r4 (22 May 2006)
+
+  22 May 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ndu-0.4-binary-locations.patch, +ndu-0.4-r4.ebuild:
+  Fix duplication of dnstouch, and move binaries to bin, as they are suitable
+  for non-root.
 
 *ndu-0.4-r3 (12 Dec 2005)
 
diff --git a/net-dns/ndu/Manifest b/net-dns/ndu/Manifest
index c25bceb2b721..ac1dbb8ef972 100644
--- a/net-dns/ndu/Manifest
+++ b/net-dns/ndu/Manifest
@@ -1,10 +1,48 @@
-MD5 d0f074009efc5e8d4dba81f5942b2d34 ChangeLog 1014
-MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4 58
-MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4-r1 58
-MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4-r2 58
-MD5 f3a54eec95c7e1c3fe531456a3ae15b2 files/digest-ndu-0.4-r3 58
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+AUX ndu-0.4-binary-locations.patch 426 RMD160 a3d11f1ae0160bf999b47214e30db575fd2031e5 SHA1 9e41eeba831fe4a4634426d8f8d6fd159709dced SHA256 c6561a2648dfd3ce86bef0bbaae53d4cca3622268b8e6694213c2332ae56407f size 426
+MD5 3a4ed9eef2d3f3429e9619d271bd5f6a files/ndu-0.4-binary-locations.patch 426
+RMD160 a3d11f1ae0160bf999b47214e30db575fd2031e5 files/ndu-0.4-binary-locations.patch 426
+SHA256 c6561a2648dfd3ce86bef0bbaae53d4cca3622268b8e6694213c2332ae56407f files/ndu-0.4-binary-locations.patch 426
+DIST ndu-0.4.tar.gz 16118 RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40 size 16118
+EBUILD ndu-0.4-r1.ebuild 1096 RMD160 098f021f6c8fa636bf955c0d70f7d0255985102f SHA1 d0f77651be0e43a503b26e4df630336fc51ea2ea SHA256 6fdd7ac17371a60bebf56a7d4e68fe2b7d886a809cd769e5a238dbe9436dabb6 size 1096
 MD5 cf0d78559c5d58ea891b234ecd32e82f ndu-0.4-r1.ebuild 1096
+RMD160 098f021f6c8fa636bf955c0d70f7d0255985102f ndu-0.4-r1.ebuild 1096
+SHA256 6fdd7ac17371a60bebf56a7d4e68fe2b7d886a809cd769e5a238dbe9436dabb6 ndu-0.4-r1.ebuild 1096
+EBUILD ndu-0.4-r2.ebuild 1661 RMD160 e149b3eb776453fb8affa1d11954e31e5cb0c1a1 SHA1 3b0072e564702729e1380e278d712b9d49726800 SHA256 66f5416bb12f02c6dcb8df3eba32a445761b1e8ccedd5993c30de0a3f5f463a1 size 1661
 MD5 5cd40e9ee967391f9ce7e0119423ba63 ndu-0.4-r2.ebuild 1661
+RMD160 e149b3eb776453fb8affa1d11954e31e5cb0c1a1 ndu-0.4-r2.ebuild 1661
+SHA256 66f5416bb12f02c6dcb8df3eba32a445761b1e8ccedd5993c30de0a3f5f463a1 ndu-0.4-r2.ebuild 1661
+EBUILD ndu-0.4-r3.ebuild 1671 RMD160 da0f555c5eb8cdc1b5721858eb59a14065283db7 SHA1 9f426cc48d449d7362a624c388eae9b0836a27ee SHA256 4eb40560a87cc0e2500047e55b2348d32e49a6b26a21013334aab64fc55d013b size 1671
 MD5 c2030a8321f86f300dd640fc2d78e8d6 ndu-0.4-r3.ebuild 1671
+RMD160 da0f555c5eb8cdc1b5721858eb59a14065283db7 ndu-0.4-r3.ebuild 1671
+SHA256 4eb40560a87cc0e2500047e55b2348d32e49a6b26a21013334aab64fc55d013b ndu-0.4-r3.ebuild 1671
+EBUILD ndu-0.4-r4.ebuild 1709 RMD160 e35d7050d60e915ba80a3084e31c5b5e249dd8f9 SHA1 277dba2a6642f50996fa941ef88eb236d5a37122 SHA256 aa7a73c72ce3bd26f087d90769dd94a3073f25d83a07b04da73b708c151a85b1 size 1709
+MD5 b7ec836a1ef6e7c47f4c4f98e54149e9 ndu-0.4-r4.ebuild 1709
+RMD160 e35d7050d60e915ba80a3084e31c5b5e249dd8f9 ndu-0.4-r4.ebuild 1709
+SHA256 aa7a73c72ce3bd26f087d90769dd94a3073f25d83a07b04da73b708c151a85b1 ndu-0.4-r4.ebuild 1709
+EBUILD ndu-0.4.ebuild 1102 RMD160 a80483334d167ed28aa848d8e0945737e1545bae SHA1 8728f45f055906573af80a959c5cb5ac49e35063 SHA256 d0fe3a22f5400bf4660ed8394d47ad46e707f031974a9dd094baa81ddc1dffac size 1102
 MD5 7e37a476d2327536bd66ed7ab9a0e819 ndu-0.4.ebuild 1102
+RMD160 a80483334d167ed28aa848d8e0945737e1545bae ndu-0.4.ebuild 1102
+SHA256 d0fe3a22f5400bf4660ed8394d47ad46e707f031974a9dd094baa81ddc1dffac ndu-0.4.ebuild 1102
+MISC ChangeLog 1251 RMD160 939546a30f9edc804156d40b5b6965282daedf23 SHA1 922e39f3c8a2e6d576e5854e2dcb1cb8da6192b2 SHA256 5b9dedda13902d99f2e811ca2dcfcacb5834e911f4b736078238313612a821ab size 1251
+MD5 36000f1baac19db1e64f8f0f738d7332 ChangeLog 1251
+RMD160 939546a30f9edc804156d40b5b6965282daedf23 ChangeLog 1251
+SHA256 5b9dedda13902d99f2e811ca2dcfcacb5834e911f4b736078238313612a821ab ChangeLog 1251
+MISC metadata.xml 279 RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f SHA1 98caf044b8fce3f5ff202c7f7b71f0dcb9d51947 SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543 size 279
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+RMD160 f84566b5a463b59cc5ddd8a2210a54de9492ed2f metadata.xml 279
+SHA256 785db7b7f8e4f9a526dc574ce2aa10024cc83af170f38ec9af9f56c23fc15543 metadata.xml 279
+MD5 5de4ee94cc162202c8050d64274144b7 files/digest-ndu-0.4 220
+RMD160 d6b28a9899b061aab384c94dffe533e4e756bdca files/digest-ndu-0.4 220
+SHA256 023c477637477bf1f639bced3d79e2ef9ce627596ebcbf98af86af46b928553a files/digest-ndu-0.4 220
+MD5 5de4ee94cc162202c8050d64274144b7 files/digest-ndu-0.4-r1 220
+RMD160 d6b28a9899b061aab384c94dffe533e4e756bdca files/digest-ndu-0.4-r1 220
+SHA256 023c477637477bf1f639bced3d79e2ef9ce627596ebcbf98af86af46b928553a files/digest-ndu-0.4-r1 220
+MD5 5de4ee94cc162202c8050d64274144b7 files/digest-ndu-0.4-r2 220
+RMD160 d6b28a9899b061aab384c94dffe533e4e756bdca files/digest-ndu-0.4-r2 220
+SHA256 023c477637477bf1f639bced3d79e2ef9ce627596ebcbf98af86af46b928553a files/digest-ndu-0.4-r2 220
+MD5 5de4ee94cc162202c8050d64274144b7 files/digest-ndu-0.4-r3 220
+RMD160 d6b28a9899b061aab384c94dffe533e4e756bdca files/digest-ndu-0.4-r3 220
+SHA256 023c477637477bf1f639bced3d79e2ef9ce627596ebcbf98af86af46b928553a files/digest-ndu-0.4-r3 220
+MD5 5de4ee94cc162202c8050d64274144b7 files/digest-ndu-0.4-r4 220
+RMD160 d6b28a9899b061aab384c94dffe533e4e756bdca files/digest-ndu-0.4-r4 220
+SHA256 023c477637477bf1f639bced3d79e2ef9ce627596ebcbf98af86af46b928553a files/digest-ndu-0.4-r4 220
diff --git a/net-dns/ndu/files/digest-ndu-0.4 b/net-dns/ndu/files/digest-ndu-0.4
index 5093a5f3bafe..cc1c10224491 100644
--- a/net-dns/ndu/files/digest-ndu-0.4
+++ b/net-dns/ndu/files/digest-ndu-0.4
@@ -1 +1,3 @@
 MD5 dbf8b8e7b65cf189e732ff11c7f08181 ndu-0.4.tar.gz 16118
+RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 ndu-0.4.tar.gz 16118
+SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40 ndu-0.4.tar.gz 16118
diff --git a/net-dns/ndu/files/digest-ndu-0.4-r1 b/net-dns/ndu/files/digest-ndu-0.4-r1
index 5093a5f3bafe..cc1c10224491 100644
--- a/net-dns/ndu/files/digest-ndu-0.4-r1
+++ b/net-dns/ndu/files/digest-ndu-0.4-r1
@@ -1 +1,3 @@
 MD5 dbf8b8e7b65cf189e732ff11c7f08181 ndu-0.4.tar.gz 16118
+RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 ndu-0.4.tar.gz 16118
+SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40 ndu-0.4.tar.gz 16118
diff --git a/net-dns/ndu/files/digest-ndu-0.4-r2 b/net-dns/ndu/files/digest-ndu-0.4-r2
index 5093a5f3bafe..cc1c10224491 100644
--- a/net-dns/ndu/files/digest-ndu-0.4-r2
+++ b/net-dns/ndu/files/digest-ndu-0.4-r2
@@ -1 +1,3 @@
 MD5 dbf8b8e7b65cf189e732ff11c7f08181 ndu-0.4.tar.gz 16118
+RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 ndu-0.4.tar.gz 16118
+SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40 ndu-0.4.tar.gz 16118
diff --git a/net-dns/ndu/files/digest-ndu-0.4-r3 b/net-dns/ndu/files/digest-ndu-0.4-r3
index 5093a5f3bafe..cc1c10224491 100644
--- a/net-dns/ndu/files/digest-ndu-0.4-r3
+++ b/net-dns/ndu/files/digest-ndu-0.4-r3
@@ -1 +1,3 @@
 MD5 dbf8b8e7b65cf189e732ff11c7f08181 ndu-0.4.tar.gz 16118
+RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 ndu-0.4.tar.gz 16118
+SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40 ndu-0.4.tar.gz 16118
diff --git a/net-dns/ndu/files/digest-ndu-0.4-r4 b/net-dns/ndu/files/digest-ndu-0.4-r4
new file mode 100644
index 000000000000..cc1c10224491
--- /dev/null
+++ b/net-dns/ndu/files/digest-ndu-0.4-r4
@@ -0,0 +1,3 @@
+MD5 dbf8b8e7b65cf189e732ff11c7f08181 ndu-0.4.tar.gz 16118
+RMD160 f9273a4428dd30a0bca3416cfcab15aa5fb04aa3 ndu-0.4.tar.gz 16118
+SHA256 27a2f523cee765db142b5582087866a90050fa00f1b365c800305204fc0c6d40 ndu-0.4.tar.gz 16118
diff --git a/net-dns/ndu/files/ndu-0.4-binary-locations.patch b/net-dns/ndu/files/ndu-0.4-binary-locations.patch
new file mode 100644
index 000000000000..4007b4dc4216
--- /dev/null
+++ b/net-dns/ndu/files/ndu-0.4-binary-locations.patch
@@ -0,0 +1,14 @@
+diff -Nuar --exclude '*~' ndu-0.4.orig/src/dnsedit ndu-0.4/src/dnsedit
+--- ndu-0.4.orig/src/dnsedit	2006-05-22 16:16:47.000000000 -0700
++++ ndu-0.4/src/dnsedit	2006-05-22 16:20:45.107741010 -0700
+@@ -19,8 +19,8 @@
+ 	if /usr/bin/diff $1 $tempfile >> /dev/null ; then
+ 	  echo No changed made
+ 	else
+-		/usr/sbin/dnstouch $1
+-		/usr/sbin/ndu
++		/usr/bin/dnstouch $1
++		/usr/bin/ndu
+ #		/usr/sbin/ndc reload
+ 		echo updated
+ 	fi
diff --git a/net-dns/ndu/ndu-0.4-r4.ebuild b/net-dns/ndu/ndu-0.4-r4.ebuild
new file mode 100644
index 000000000000..a0857c9b5a83
--- /dev/null
+++ b/net-dns/ndu/ndu-0.4-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ndu/ndu-0.4-r4.ebuild,v 1.1 2006/05/22 23:28:07 robbat2 Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DNS serial number incrementer and reverse zone builder"
+SRC_URI="http://uranus.it.swin.edu.au/~jn/linux/${P}.tar.gz"
+HOMEPAGE="http://uranus.it.swin.edu.au/~jn/linux/dns.htm"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+DEPEND="sys-apps/sed
+		virtual/libc"
+RDEPEND="virtual/libc
+		sys-apps/ed" # dnstouch calls ed to do the dirty work
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-binary-locations.patch
+
+	cd ${S}/src
+	# use the correct compiler
+	sed -e 's|gcc|$(CXX)|g' -i Makefile
+	# set correct config pathes
+	sed -e 's|#define CONFIG_PATH "/etc/"|#define CONFIG_PATH "/etc/bind/"|g' -i ndu.cpp
+	sed -e 's|"/etc/ndu.conf"|"/etc/bind/ndu.conf"|g' -i dnstouch.cpp
+	# hack up something to work around bug #73858
+	sed -e 's|execlp("ed", "ed", filename, 0);|execlp("ed", "ed", "-s", filename, 0);|g' -i dnstouch.cpp
+	# use the correct editor
+	sed -e 's|VISUAL|EDITOR|g' -i dnsedit
+
+	cd ${S}
+	# match our bind config
+	sed -e 's|0.0.127.in-addr.arpa|127.in-addr.arpa|g' -i ndu.conf
+	# document the support for the chrooted BIND setup
+	echo '// if you use a chrooted setup, then you need to uncomment these lines:' >>ndu.conf
+	echo '//process "/chroot/dns/named.conf"' >>ndu.conf
+	echo '//chroot "/chroot/dns"' >>ndu.conf
+}
+
+src_compile() {
+	cd ${S}/src
+	emake CFLAGS="${CFLAGS}" CXX="$(tc-getCXX)"
+}
+
+src_install () {
+	into /usr
+	dobin src/{dnsedit,ndu,dnstouch}
+	into /
+	insinto /etc/bind
+	doins ndu.conf
+	dodoc README INSTALL
+}