summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-12-04 10:02:54 +0000
committerUlrich Müller <ulm@gentoo.org>2007-12-04 10:02:54 +0000
commit72f43ffb417d9936a7fcdd9dcf9b6911f9f11409 (patch)
treed374cfd853085406d8fd01c794b8a800b4317628 /net-misc
parentPackage mask app-emacs/md5 and app-emacs/sha1 for removal. (diff)
downloadgentoo-2-72f43ffb417d9936a7fcdd9dcf9b6911f9f11409.tar.gz
gentoo-2-72f43ffb417d9936a7fcdd9dcf9b6911f9f11409.tar.bz2
gentoo-2-72f43ffb417d9936a7fcdd9dcf9b6911f9f11409.zip
Don't tamper with /etc/services. Fixes bug #195120.
(Portage version: 2.1.4_rc4)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/ndtpd/ChangeLog5
-rw-r--r--net-misc/ndtpd/ndtpd-3.1.5.ebuild17
2 files changed, 8 insertions, 14 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/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,}