summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-09-16 17:52:15 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-09-16 17:52:15 +0000
commit42698fd8fee8f4b02ce7abe64833e4ac02ac5c01 (patch)
tree3700adff2c0af68427820ed3c5e7b2e263ace4b9 /dev-util/git
parentppc stable, bug #222119 (diff)
downloadgentoo-2-42698fd8fee8f4b02ce7abe64833e4ac02ac5c01.tar.gz
gentoo-2-42698fd8fee8f4b02ce7abe64833e4ac02ac5c01.tar.bz2
gentoo-2-42698fd8fee8f4b02ce7abe64833e4ac02ac5c01.zip
Git 1.6 requires that daemon been an argument not part of the name.
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6-00443-g435eb77 x86_64)
Diffstat (limited to 'dev-util/git')
-rw-r--r--dev-util/git/ChangeLog6
-rw-r--r--dev-util/git/files/git-daemon.initd4
-rw-r--r--dev-util/git/files/git-daemon.xinetd4
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-util/git/ChangeLog b/dev-util/git/ChangeLog
index 227fd2ce0477..40cc6f4da02f 100644
--- a/dev-util/git/ChangeLog
+++ b/dev-util/git/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/git
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.294 2008/08/30 03:32:07 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/ChangeLog,v 1.295 2008/09/16 17:52:15 robbat2 Exp $
+
+ 16 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> files/git-daemon.initd,
+ files/git-daemon.xinetd:
+ Git 1.6 requires that daemon been an argument not part of the name.
*git-1.6.0.1 (30 Aug 2008)
diff --git a/dev-util/git/files/git-daemon.initd b/dev-util/git/files/git-daemon.initd
index beb2fc34a7c2..60ccba02d2d9 100644
--- a/dev-util/git/files/git-daemon.initd
+++ b/dev-util/git/files/git-daemon.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.2 2008/03/20 12:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/git/files/git-daemon.initd,v 1.3 2008/09/16 17:52:15 robbat2 Exp $
depend() {
need net
@@ -11,7 +11,7 @@ depend() {
start() {
ebegin "Starting git-daemon"
start-stop-daemon --start --quiet --background \
- --exec /usr/bin/git-daemon -- ${GITDAEMON_OPTS}
+ --exec /usr/bin/git -- daemon ${GITDAEMON_OPTS}
eend $?
}
diff --git a/dev-util/git/files/git-daemon.xinetd b/dev-util/git/files/git-daemon.xinetd
index a0748b20ccf4..02c938d4bd6c 100644
--- a/dev-util/git/files/git-daemon.xinetd
+++ b/dev-util/git/files/git-daemon.xinetd
@@ -8,6 +8,6 @@ service git-daemon
protocol = tcp
log_on_failure += USERID
port = 9418
- server = /usr/bin/git-daemon
- server_args = --inetd --syslog --export-all --base-path=/var/git
+ server = /usr/bin/git
+ server_args = daemon --inetd --syslog --export-all --base-path=/var/git
}