Don't tamper with /etc/services. Fixes bug #195120.

Package-Manager: portage-2.1.4_rc4

3 files changed, 20 insertions, 26 deletions

diff --git a/net-misc/ndtpd/ChangeLog b/net-misc/ndtpd/ChangeLog
index 2990c05bd33f..72fd6984bf2f 100644
--- a/net-misc/ndtpd/ChangeLog
+++ b/net-misc/ndtpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/ndtpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.13 2007/04/28 16:58:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.14 2007/12/04 10:02:54 ulm Exp $
+
+  04 Dec 2007; Ulrich Mueller <ulm@gentoo.org> ndtpd-3.1.5.ebuild:
+  Don't tamper with /etc/services. Fixes bug #195120.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> ndtpd-3.1.5.ebuild:
   Fix *initd, *confd and *envd calls (#17388, #174266)
diff --git a/net-misc/ndtpd/Manifest b/net-misc/ndtpd/Manifest
index 638ae54bc01e..449e73da2c3f 100644
--- a/net-misc/ndtpd/Manifest
+++ b/net-misc/ndtpd/Manifest
@@ -10,14 +10,14 @@ MD5 55c0139b320c6367cf6b91e65d0511bc files/ndtpd.initd 663
 RMD160 fdf69d949cec39372a3a8fec04d3cb49c943eebf files/ndtpd.initd 663
 SHA256 a2053f2e385a51c9cc6a6716ee73fefc0ec25f69711453b4382b8dd90c237639 files/ndtpd.initd 663
 DIST ndtpd-3.1.5.tar.gz 558367 RMD160 6b54e2e3d4ca30f4c78363696d9127edf72deece SHA1 0445cf4c9be4373f0ed06a545a0665f5e6fad7aa SHA256 5ef2f6323d319979a091a255589d1a66556f0d0ae2f357653adf5fda7c2a0c31
-EBUILD ndtpd-3.1.5.ebuild 1430 RMD160 8f526b7a204b2e9c3797e0d093b37771e2e507dc SHA1 ac7b6c34265990a49bf98eb21ebbb4743b64945a SHA256 776704d7214f00cd81ed333673598f1992073ca6b5d3b79304446b5fb81ed51b
-MD5 961f59b593a9fe1087dda909cb07e267 ndtpd-3.1.5.ebuild 1430
-RMD160 8f526b7a204b2e9c3797e0d093b37771e2e507dc ndtpd-3.1.5.ebuild 1430
-SHA256 776704d7214f00cd81ed333673598f1992073ca6b5d3b79304446b5fb81ed51b ndtpd-3.1.5.ebuild 1430
-MISC ChangeLog 1691 RMD160 d618f85877086fa026afcfdc8be0f174bb607602 SHA1 d5b7809d32b85ef7f51235e1e56b4e92c30ae491 SHA256 69a6a3f6c282173e7e00131d8b30145f5b30f9d3f082d00fa0f3488b35a61817
-MD5 87c6fc9e5e81d1d119e47950e2b3025f ChangeLog 1691
-RMD160 d618f85877086fa026afcfdc8be0f174bb607602 ChangeLog 1691
-SHA256 69a6a3f6c282173e7e00131d8b30145f5b30f9d3f082d00fa0f3488b35a61817 ChangeLog 1691
+EBUILD ndtpd-3.1.5.ebuild 1204 RMD160 f3a6ce833137463be6de7c53812d0f74c33cb2c4 SHA1 72a8c9ea78f3f021f040be15930d1d4047133bec SHA256 35fb10bc5f86d1028c24c201c117e533c17c379a2595534864b96b507aba3f87
+MD5 28baa8edd42ea00e02d2b9eea0fe6b36 ndtpd-3.1.5.ebuild 1204
+RMD160 f3a6ce833137463be6de7c53812d0f74c33cb2c4 ndtpd-3.1.5.ebuild 1204
+SHA256 35fb10bc5f86d1028c24c201c117e533c17c379a2595534864b96b507aba3f87 ndtpd-3.1.5.ebuild 1204
+MISC ChangeLog 1808 RMD160 867ee9eb3b4b614f77c8cb678e9c4593299b9da1 SHA1 875d5bc481cf6f5fc7b4cb4a5820f219d294d229 SHA256 a38ceb6b7683953c36bbcfc832d9256a28ee938df4c1b12d7adce159fbdf9126
+MD5 ffafae9264da796896fec0fb0658fd2b ChangeLog 1808
+RMD160 867ee9eb3b4b614f77c8cb678e9c4593299b9da1 ChangeLog 1808
+SHA256 a38ceb6b7683953c36bbcfc832d9256a28ee938df4c1b12d7adce159fbdf9126 ChangeLog 1808
 MISC metadata.xml 251 RMD160 9396edc604421b3ba0aad54d54e37d8cff67fc6e SHA1 cbc737758bf564a58495ab4c86ca79de6c3bdce5 SHA256 b1cc0d5b6e97c2e5e2ea7d858b7ae36eeafc164a33517e78dac62f9976f46c61
 MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
 RMD160 9396edc604421b3ba0aad54d54e37d8cff67fc6e metadata.xml 251
@@ -26,9 +26,9 @@ MD5 3bab0adab1108d563b07f9bde420ce4e files/digest-ndtpd-3.1.5 235
 RMD160 17b323a22e0cb4a236ceb12775dba10c12474237 files/digest-ndtpd-3.1.5 235
 SHA256 d317d8828ebdf40c78e431333317bb1b03a55e1d08b31c55929c6d38c275bb73 files/digest-ndtpd-3.1.5 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGM300I1lqEGTUzyQRAi1TAKDcJneTsONe56MZf6EImzfEM+gWsgCeMtDr
-O4+NUDRcYcNs9qj+aZvLqmc=
-=kh6D
+iD8DBQFHVSXoOeoy/oIi7uwRAhc4AKDJWbJYbw3upeelGYQUTA1WtYc96QCg2Hf1
+tttM1QlQRafW4cEQ0D8SoNU=
+=LTay
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ndtpd/ndtpd-3.1.5.ebuild b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
index a0aec119b2e6..5ee24cb7b2c9 100644
--- a/net-misc/ndtpd/ndtpd-3.1.5.ebuild
+++ b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.12 2007/04/28 16:58:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.13 2007/12/04 10:02:54 ulm Exp $
 
 inherit eutils
 
@@ -28,8 +28,8 @@ pkg_setup() {
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-eb4-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-eb4-gentoo.diff"
 }
 
 src_compile() {
@@ -44,16 +44,7 @@ src_install() {
 
 	einstall || die
 
-	if ! $(grep 2010/tcp /etc/services >/dev/null 2>&1) ; then
-		cp /etc/services ${T}/services
-		cat >>${T}/services<<-EOF
-		ndtp		2010/tcp			# Network Dictionary Transfer Protocol
-		EOF
-		insinto /etc
-		doins ${T}/services
-	fi
-
-	newinitd ${FILESDIR}/ndtpd.initd ndtpd
+	newinitd "${FILESDIR}/ndtpd.initd" ndtpd
 
 	insinto /etc
 	newins ndtpd.conf{.sample,}