summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Welch <zwelch@gentoo.org>2003-02-18 01:38:26 +0000
committerZack Welch <zwelch@gentoo.org>2003-02-18 01:38:26 +0000
commitcfe79c9fdca73bd873ead1d11e0f2a9ec3caa5b5 (patch)
tree1ff4e03568e854720952ecf82b95a4dde87cefc8 /sys-devel
parentinitial ebuild #14124 (diff)
downloadgentoo-2-cfe79c9fdca73bd873ead1d11e0f2a9ec3caa5b5.tar.gz
gentoo-2-cfe79c9fdca73bd873ead1d11e0f2a9ec3caa5b5.tar.bz2
gentoo-2-cfe79c9fdca73bd873ead1d11e0f2a9ec3caa5b5.zip
small corrections for distcc-1.1-r10
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/distcc/ChangeLog3
-rw-r--r--sys-devel/distcc/distcc-1.1-r10.ebuild7
-rw-r--r--sys-devel/distcc/files/distccd.46
3 files changed, 11 insertions, 5 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 5515fac541db..513a958b0a45 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,11 +1,12 @@
# ChangeLog for sys-devel/distcc
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.22 2003/02/17 23:48:23 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.23 2003/02/18 01:38:26 zwelch Exp $
*distcc-1.1-r10 (17 Feb 2003)
17 Feb 2003; Zach Welch <zwelch@gentoo.org> :
Add /var/run/distccd for pid and distcc user... (bugs 15048 and 15769)
+ Updated to fix minor bugs in original -r10
*distcc-1.1-r9 (17 Feb 2003)
diff --git a/sys-devel/distcc/distcc-1.1-r10.ebuild b/sys-devel/distcc/distcc-1.1-r10.ebuild
index b5a3bfc2c268..d1f632ff9663 100644
--- a/sys-devel/distcc/distcc-1.1-r10.ebuild
+++ b/sys-devel/distcc/distcc-1.1-r10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-1.1-r10.ebuild,v 1.1 2003/02/17 23:48:23 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-1.1-r10.ebuild,v 1.2 2003/02/18 01:38:26 zwelch Exp $
inherit eutils
@@ -65,6 +65,11 @@ pkg_preinst() {
id distcc 2> /dev/null && USERFIX=usermod || USERFIX=useradd
${USERFIX} -g daemon -s /bin/false -d /dev/null -c "distccd" distcc || \
die "Failed to \`${USERFIX} distcc\` user"
+ # stop daemon since script is being updated
+
+ einfo "Stopping distccd..."
+ [ -x /etc/init.d/distccd ] &&
+ /etc/init.d/distccd stop > /dev/null 2>&1
}
pkg_postinst() {
diff --git a/sys-devel/distcc/files/distccd.4 b/sys-devel/distcc/files/distccd.4
index 438cff847133..f51528f2e8fc 100644
--- a/sys-devel/distcc/files/distccd.4
+++ b/sys-devel/distcc/files/distccd.4
@@ -8,7 +8,7 @@ depend() {
}
start() {
- rm -rf ${DISTCCD_PIDFILE}
+ rm -f ${DISTCCD_PIDFILE}
ebegin "Starting distccd"
PATH="$(gcc-config --get-bin-path):${PATH}" \
/sbin/start-stop-daemon --start --quiet \
@@ -20,8 +20,8 @@ start() {
stop() {
ebegin "Stopping distccd"
- start-stop-daemon --stop --quiet --pidfile ${DISTCC_PIDFILE}
- rm -rf ${DISTCC_PIDFILE}
+ start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
+ rm -f "${DISTCCD_PIDFILE}"
eend $? "Failed to Stop distccd"
}