From owner-svn-ports-all@FreeBSD.ORG  Mon Nov 12 20:32:17 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DC9D94A7;
 Mon, 12 Nov 2012 20:32:17 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A83D48FC0C;
 Mon, 12 Nov 2012 20:32:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qACKWHCQ099241;
 Mon, 12 Nov 2012 20:32:17 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qACKWHuP099237;
 Mon, 12 Nov 2012 20:32:17 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201211122032.qACKWHuP099237@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Mon, 12 Nov 2012 20:32:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307344 - in head: . devel/git devel/git/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 20:32:17 -0000

Author: wxs
Date: Mon Nov 12 20:32:17 2012
New Revision: 307344
URL: http://svnweb.freebsd.org/changeset/ports/307344

Log:
  Add git_daemon to UIDs and GIDs.
  Make git_daemon run as the git_daemon user.
  
  Requested by:	lme@
  Feature safe:	yes

Modified:
  head/GIDs
  head/UIDs
  head/devel/git/Makefile
  head/devel/git/files/git_daemon.in   (contents, props changed)

Modified: head/GIDs
==============================================================================
--- head/GIDs	Mon Nov 12 19:11:40 2012	(r307343)
+++ head/GIDs	Mon Nov 12 20:32:17 2012	(r307344)
@@ -243,5 +243,6 @@ trytond:*:960:
 gearmand:*:961:
 zookeeper:*:962:
 fluentd:*:963:
+git_daemon:*:964:
 nogroup:*:65533:
 nobody:*:65534:

Modified: head/UIDs
==============================================================================
--- head/UIDs	Mon Nov 12 19:11:40 2012	(r307343)
+++ head/UIDs	Mon Nov 12 20:32:17 2012	(r307344)
@@ -247,4 +247,5 @@ trytond:*:960:960::0:0:trytond daemon:/v
 gearmand:*:961:961::0:0:gearmand daemon:/var/empty:/usr/sbin/nologin
 zookeeper:*:962:962::0:0:zookeeper user:/nonexistent:/usr/sbin/nologin
 fluentd:*:963:963::0:0:fluentd user:/nonexistent:/usr/sbin/nologin
+git_daemon:*:964:964::0:0:git daemon:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Mon Nov 12 19:11:40 2012	(r307343)
+++ head/devel/git/Makefile	Mon Nov 12 20:32:17 2012	(r307344)
@@ -184,6 +184,9 @@ MAN7=		gitcli.7 \
 
 CONFLICTS?=	git-subversion-[0-9]*
 
+USERS=	git_daemon
+GROUPS=	git_daemon
+
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 

Modified: head/devel/git/files/git_daemon.in
==============================================================================
--- head/devel/git/files/git_daemon.in	Mon Nov 12 19:11:40 2012	(r307343)
+++ head/devel/git/files/git_daemon.in	Mon Nov 12 20:32:17 2012	(r307344)
@@ -15,13 +15,15 @@
 . /etc/rc.subr
 
 name="git_daemon"
-rcvar=git_daemon_enable
+rcvar="git_daemon_enable"
 
 load_rc_config $name
 
+: ${git_daemon_user:=git_daemon}
+: ${git_daemon_group:=git_daemon}
 : ${git_daemon_enable:=NO}
 : ${git_daemon_directory:=%%PREFIX%%/git}
-: ${git_daemon_flags:="--syslog --reuseaddr --detach"}
+: ${git_daemon_flags:=--syslog --reuseaddr --detach}
 
 command="%%PREFIX%%/libexec/git-core/git-daemon"
 command_args="${git_daemon_directory}"