From 026f93f8551935dd65247403cb6f1f4b091435cb Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 1 Oct 2015 21:32:26 +0200
Subject: [PATCH] gitlab-git-http-server must run as user git!

---
 dev-vcs/gitlab-git-http-server/Manifest                    | 4 ++--
 .../files/gitlab-git-http-server.conf                      | 2 +-
 .../gitlab-git-http-server-0.2.10.ebuild                   | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dev-vcs/gitlab-git-http-server/Manifest b/dev-vcs/gitlab-git-http-server/Manifest
index f83e5aa..3a7294f 100644
--- a/dev-vcs/gitlab-git-http-server/Manifest
+++ b/dev-vcs/gitlab-git-http-server/Manifest
@@ -1,5 +1,5 @@
 AUX fix-Makefile-0.2.10.patch 386 SHA256 16a0441a38a057773859af0a50f6f21fa1220c94dfc7521d2b9f86d9931cafbf SHA512 e18e74cdfa8d540b541e0b00e8a8bc70e2691e9985bc5a4f302848be99bd9765ef5531cb6a92ad807daec85e7c5e5d1f19c6a4223460755de304a1eeb419b87c WHIRLPOOL ce23abcd31287e28a27762b2c51ab906e3eb652f1c3c23011b6257d271f59a72b34d89e9624ab1a9941c62910775c0b8651d11c414a11760417f106800d6ec1c
-AUX gitlab-git-http-server.conf 222 SHA256 363b39f109219d478d3060b300115eddffd17988569ad485bfab0f4ad5cb5374 SHA512 f246cafbd4d7e7b7c30c24396751ff0d6f549934e87aad10e668b1bfe37de0bd319827dee2392919455ffd05977aa5a198a25d6664dda1d4100b42c303f20f1f WHIRLPOOL 901bc146461d532b1b9cedc506f9baf99a9064dd4e88adbdbd2761abf57814de5aca6fda990143618575a5a4865dd2b8789ed9ec3a6195f14a077eb12bc2c660
+AUX gitlab-git-http-server.conf 203 SHA256 7a2a7db948465382822ce0b995bfce0f10a312f25c912727d6516f2a103c70b6 SHA512 b0f83ef007e7dae5453cdb6230df894db437ba088c82e84335f5663b97edea48059dc2f279f81147a05afd6324a962d03131784ac1d9c3c90dc4cc3f35527163 WHIRLPOOL ab503f862e965366b3c3fb8ac7c83fab1aac8ca55b8e4f576fa65a58007e0868ba17c1f65351bf2290ddb2f2d7f6bd4ecfebbacbc7beba7e46e2551ef41a0059
 AUX gitlab-git-http-server.init 645 SHA256 b47fdf7dc9d6cad0e3257c8822d210884329b5e3f9a02d14f96e521b659cffd3 SHA512 57fa092055c8bc30ee3b48b91dc493deabbcfd4fa171d903c348e405b74cb83ccb61e426d89af813265aabc92b30e7de45a4e001651be5e2ca32a5d8299b22f2 WHIRLPOOL 859473aeb215a6380bc3957f80ad581cdf8448e568148ac35a5d2ebaf9ceb0b35699d15d8290aba46e096763eb7957b6c25a5a714792845a35c9e03ebb751d70
 DIST gitlab-git-http-server-0.2.10.tar.bz2 7150 SHA256 13a43078c2fe321c83c4af61db087ed5f1bef443a866dd05704717e197ce8f2a SHA512 faae12473e3994bfed31c7b13ad20e30f74a954db1b622ff911dce9be4dbc1a54a0ee4d0e9706f443928ad72ea810184360c590251e8012a882e8dea1538878b WHIRLPOOL c0b8ad7143bfc40b0540a5dd3466eb26b8698a3aa307a0086020d42968d23f785b4a22309b04f6923e6003efa53dc4a4412ec13fb7ec5c21f54220d04d786032
-EBUILD gitlab-git-http-server-0.2.10.ebuild 1013 SHA256 a58fbddd639ec411198bf616afa57adf5cbc2eaad766c1fd803c98465f0d1131 SHA512 2b80f94c9481c7ecd9ee861720d3c9dc1a8dcf32f9d0cbc8fb63b89381514c41db6c7845430d3e8ba0b8d60f059fe98f060163e15f31bc3704d277d2916192a0 WHIRLPOOL 9b363c208ebde3a85d4cd21ae527c938b5701889fbdc57650c34b1191782b932096faca4e2113da10b2fb8b7c41487ba6a4453a56abd0eee9331c2ab1e749270
+EBUILD gitlab-git-http-server-0.2.10.ebuild 896 SHA256 348bfa37aabd8d604542bc5b67c48b838e119bd716b57334541b142f221289dd SHA512 885bbbe39e46992c2f9e444a8931a76d430184dc368ae6b4d7173a12533f47b01045d15c6864af0484b3088f18acdabb2f5afbeb3e712a960c4a312692fcea39 WHIRLPOOL 200f145c8df1d850e1c93c0c3e7af7d78e89f6f25de4b9bff271b17e604974fac7feeaf74b20904678e48465145b4fe935db18750a30e25b1465829e864e0798
diff --git a/dev-vcs/gitlab-git-http-server/files/gitlab-git-http-server.conf b/dev-vcs/gitlab-git-http-server/files/gitlab-git-http-server.conf
index 6322a9a..1ab32a5 100644
--- a/dev-vcs/gitlab-git-http-server/files/gitlab-git-http-server.conf
+++ b/dev-vcs/gitlab-git-http-server/files/gitlab-git-http-server.conf
@@ -6,5 +6,5 @@ PPROF_LISTEN_ADDRESS=
 
 GIT_REPO_PATH=/var/lib/git/repositories
 
-RUNAS_USER=gitlab_git_http_server
+RUNAS_USER=git
 RUNAS_GROUP=${RUNAS_USER}
diff --git a/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild b/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild
index 4687dda..1c38876 100644
--- a/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild
+++ b/dev-vcs/gitlab-git-http-server/gitlab-git-http-server-0.2.10.ebuild
@@ -18,8 +18,6 @@ KEYWORDS="~amd64 ~x86"
 
 CDEPEND=">=dev-lang/go-1.5"
 
-MY_USER="gitlab_git_http_server"
-
 src_prepare() {
 	epatch "${FILESDIR}/fix-Makefile-${PV}.patch"
 }
@@ -37,8 +35,3 @@ src_install() {
 	newinitd "${FILESDIR}/gitlab-git-http-server.init" "${PN}"
 	newconfd "${FILESDIR}/gitlab-git-http-server.conf" "${PN}"
 }
-
-pkg_postinst() {
-	enewgroup ${MY_USER}
-	enewuser ${MY_USER} -1 -1 -1 ${MY_USER}
-}