From 2623082364a12754162775664f45c0e584f08465d26203f0df958b092530a9b1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 24 Oct 2008 13:08:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=20 --- git.changes | 5 +++++ git.spec | 4 +++- git.xinetd | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/git.changes b/git.changes index b909118..6f2b868 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 24 15:03:52 CEST 2008 - tiwai@suse.de + +- fix git.xinetd not to run the old git-daemon (bnc#438715) + ------------------------------------------------------------------- Mon Oct 6 15:53:47 CEST 2008 - tiwai@suse.de diff --git a/git.spec b/git.spec index 439c16c..fc8dce2 100644 --- a/git.spec +++ b/git.spec @@ -20,7 +20,7 @@ Name: git BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto Version: 1.6.0.2 -Release: 3 +Release: 4 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -376,6 +376,8 @@ fi /etc/bash_completion.d/git.sh %changelog +* Fri Oct 24 2008 tiwai@suse.de +- fix git.xinetd not to run the old git-daemon (bnc#438715) * Mon Oct 06 2008 tiwai@suse.de - fix git-daemon init script to start (bnc#432610) * Fri Sep 26 2008 schwab@suse.de diff --git a/git.xinetd b/git.xinetd index 45388bf..bb7d02b 100644 --- a/git.xinetd +++ b/git.xinetd @@ -7,8 +7,8 @@ service git wait = no user = git-daemon group = nogroup - server = /usr/bin/git-daemon - server_args = --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path="/srv/git" + server = /usr/bin/git + server_args = daemon --syslog --detach --reuseaddr --user=git-daemon --group=nogroup --pid-file=/var/run/git-daemon.pid --base-path="/srv/git" type = UNLISTED port = 9418 log_on_failure += USERID