Accepting request 102275 from devel:tools:scm

- Added the ability to specify the user and group that git-daemon run
  as (bnc#742661).

OBS-URL: https://build.opensuse.org/request/show/102275
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=81

git-daemon.init

@@ -58,6 +58,9 @@ test -r $git_daemon_config || { echo "$git_daemon_config not existing";
 
 : ${GIT_DAEMON_BASE_PATH:=/srv/git}
 
+: ${GIT_DAEMON_USER:=git-daemon}
+: ${GIT_DAEMON_GROUP:=nogroup}
+
 . /etc/rc.status
 
 # Reset status of this service
@@ -70,8 +73,8 @@ case "$1" in
 		--syslog \
 		--detach \
 		--reuseaddr \
-		--user=git-daemon \
+		--user=${GIT_DAEMON_USER} \
-		--group=nogroup \
+		--group=${GIT_DAEMON_GROUP} \
 		--pid-file=$pidfile \
 		--base-path="$GIT_DAEMON_BASE_PATH" \
 		$GIT_DAEMON_ARGS 

git.changes

@@ -1,8 +1,79 @@
+-------------------------------------------------------------------
+Fri Jan 27 15:58:06 UTC 2012 - jpschewe@mtu.net
+
+- Added the ability to specify the user and group that git-daemon run
+  as (bnc#742661).
+
 -------------------------------------------------------------------
 Wed Jan 11 12:41:46 UTC 2012 - idonmez@suse.com
 
 - Update to v1.7.8.3
-  * Bugfixes, see included ChangeLog for details.
+
+  * Attempt to fetch from an empty file pretending it to be a bundle did
+   not error out correctly.
+
+  * gitweb did not correctly fall back to configured $fallback_encoding
+   that is not 'latin1'.
+
+  * "git clone --depth $n" did not catch a non-number given as $n as an
+   error.
+
+  * Porcelain commands like "git reset" did not distinguish deletions
+    and type-changes from ordinary modification, and reported them with
+    the same 'M' moniker. They now use 'D' (for deletion) and 'T' (for
+    type-change) to match "git status -s" and "git diff --name-status".
+  
+  * You could make "git commit" segfault by giving the "--no-message"
+   option.
+
+  * "git checkout -m" did not recreate the conflicted state in a "both
+   sides added, without any common ancestor version" conflict
+   situation.
+
+  * git native connection going over TCP (not over SSH) did not set
+   SO_KEEPALIVE option which failed to receive link layer errors.
+
+  * "fast-import" did not correctly update an existing notes tree,
+   possibly corrupting the fan-out.
+
+  * "git log --follow" did not honor the rename threshold score given
+   with the -M option (e.g. "-M50%").
+
+  * Authenticated "git push" over dumb HTTP were broken with a recent
+   change and failed without asking for password when username is
+   given.
+
+  * "git push" to an empty repository over HTTP were broken with a
+   recent change to the ref handling.
+
+  * "git push -v" forgot how to be verbose by mistake. It now properly
+   becomes verbose when asked to.
+
+  * When a "reword" action in "git rebase -i" failed to run "commit --amend",
+   we did not give the control back to the user to resolve the situation, and
+   instead kept the original commit log message.
+
+  * "git apply --check" did not error out when given an empty input
+   without any patch.
+
+  * "git archive" mistakenly allowed remote clients to ask for commits
+   that are not at the tip of any ref.
+
+  * "git checkout" and "git merge" treated in-tree .gitignore and exclude
+   file in $GIT_DIR/info/ directory inconsistently when deciding which
+   untracked files are ignored and expendable.
+
+  * The function header pattern for files with "diff=cpp" attribute did
+   not consider "type *funcname(type param1,..." as the beginning of a
+   function.
+
+  * The error message from "git diff" and "git status" when they fail
+   to inspect changes in submodules did not report which submodule they
+   had trouble with.
+
+  * "git pack-objects" avoids creating cyclic dependencies among deltas
+   when seeing a broken packfile that records the same object in both
+   the deflated form and as a delta.
 
 -------------------------------------------------------------------
 Tue Dec 13 18:11:00 UTC 2011 - idonmez@suse.com

sysconfig.git-daemon

@@ -16,3 +16,19 @@ GIT_DAEMON_BASE_PATH=""
 #
 # additional arguments for git-daemon. See manual page
 GIT_DAEMON_ARGS=""
+
+## Type:	   string
+## Default: 
+#
+# defaults to "git-daemon" if not set
+#
+# User to run git-daemon as.
+GIT_DAEMON_USER=""
+
+## Type:	   string
+## Default: 
+#
+# defaults to "nogroup" if not set
+#
+# Group to run git-daemon as.
+GIT_DAEMON_GROUP=""