dev-vcs/gitlab-shell:

Fix ebuild for gitlab-shell-5.1.1; it requires some more love than the previous versions.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

dev-vcs/gitlab-shell/ChangeLog

@@ -1,3 +1,9 @@
+  08 Jul 2017; Manuel Friedli <manuel@fritteli.ch>
+  +files/0001-gitlab-shell-4.1.1-config-paths.patch,
+  +files/0002-gitlab-shell-5.1.1-Makefile.patch, gitlab-shell-5.1.1.ebuild:
+  dev-vcs/gitlab-shell:  Fix ebuild for gitlab-shell-5.1.1; it requires some
+  more love than the previous versions.
+
 *gitlab-shell-5.1.1 (08 Jul 2017)
 
   08 Jul 2017; Manuel Friedli <manuel@fritteli.ch> +gitlab-shell-5.1.1.ebuild:

dev-vcs/gitlab-shell/Manifest

@@ -1,3 +1,5 @@
+AUX 0001-gitlab-shell-4.1.1-config-paths.patch 2152 SHA256 e789f0c8a8b7ec8a840ce26dd63d6e5386a149f619d7ad5a6788577d897c4826 SHA512 6ae5af0c364061af4c9675804e2f6d6b662ed4891ed4c80bc1be39e9da6343db372e58bf04a0d3c8a4fc218daeb8cda45636e0da0c67ec801168e84004d05b86 WHIRLPOOL b8136b81ef943c15feeca303d1d7f0d55c85ff7f7ec82bfceea026ce334ca24fce0dfb599946562bd0aceb89a2216bcfaa894235c43f41e3031a305f85e756b4
+AUX 0002-gitlab-shell-5.1.1-Makefile.patch 252 SHA256 cb45d73d9a2b5a30d2c457d6ddef9953b4a907e4929575709997a3edcb416cc2 SHA512 ce185a66e746e7791ca7ace15757d24a6fe426a986837a3b41c18771c0e3395baa05488735273171d41f764a9cee2517dc64e629f4d9b2aedc0bd57650350d9f WHIRLPOOL d6c6562a9d6efb904580732c43538b86b7ea8fb9dab538ede162018f86974a2e330403b385f636734b67be894063671e17814865de0ae36b8e8eb9ef1199aa3d
 AUX gitlab-shell-4.1.1-config-paths.patch 2152 SHA256 e789f0c8a8b7ec8a840ce26dd63d6e5386a149f619d7ad5a6788577d897c4826 SHA512 6ae5af0c364061af4c9675804e2f6d6b662ed4891ed4c80bc1be39e9da6343db372e58bf04a0d3c8a4fc218daeb8cda45636e0da0c67ec801168e84004d05b86 WHIRLPOOL b8136b81ef943c15feeca303d1d7f0d55c85ff7f7ec82bfceea026ce334ca24fce0dfb599946562bd0aceb89a2216bcfaa894235c43f41e3031a305f85e756b4
 DIST gitlab-shell-4.1.1.tar.gz 78829 SHA256 61f684b4528b0b789aad80efbfd8f9870d113f6e2794e589e0db9e74e6737e1d SHA512 17b929da1c6148a9af2787ca4a18081e3108622a40c6fb3f02f36f4ba41f2a1d61cf83509ace849093334af8f4ad74d8a36393bf9fca7ab21163d2f48b499879 WHIRLPOOL cfd258e93abeae4a33c1578114d56186c81a7c5894a3ccb9b690dd9a78051746916f3bac2b7146b8378534d5e177ba4cacb4c2011b64011328b056d4d397967e
 DIST gitlab-shell-5.0.0.tar.gz 78585 SHA256 7611fdf0b64592365bdb6ba442a4263d129b05c280d5105ea641baec7a0b45ab SHA512 84c86c42e0ff6029ddcdd9a93410b261f4f5a1e8cdb0fd114db2eab56b1fc63f4f8ed6d0cc0c6016d0f02413d6d213aab7a995adadb186c0dfe49e49b762e904 WHIRLPOOL ddaf25f837dbbdbfd6578062b89a8102ffbe0dc88f51890a38f59add61653368b0ad0ea146a8a7eac52fa482f7316aae712f53075f750db02fa8e8ce370f76e6
@@ -12,6 +14,6 @@ EBUILD gitlab-shell-5.0.2.ebuild 3653 SHA256 9ed7d4b6dc1ca2d6ee0c928cfd9f33da45a
 EBUILD gitlab-shell-5.0.3.ebuild 3653 SHA256 e2c2cfb805378a6cd7e87d536a43c1d96ae489ce66b8168e6cbc42b703736c0e SHA512 65093fb42096002f2f715b18561f11cfb8afbc36188514a2d95023be53025946928e4e712d03d470d0bf52e6d0ecf8d0438b29cd5c55e162d85a15963e430b48 WHIRLPOOL 3278d0eea3f614f726d0df8d0e6a2f49c1e9d4341829f65fc29aa94544470b5b36ee7ce0d464af2b3b535f3f2f10c16c11d3c39dc87c34f9fbb693f61e9ffa3b
 EBUILD gitlab-shell-5.0.4.ebuild 3653 SHA256 c3e2b2dbb4c6b29bf46442791caee2116be2c698a9cbec9d91ac58b1a5d98adb SHA512 035508013085da402a5926faa5da6b6ac6ac726169122766e381096b316b13e887e99f178a8980d831d0a788549e26b07bdae284bc3a90b3a21b534071239581 WHIRLPOOL 807caff4227ea9fdb853a0e5622dea4d4e8b66c3c8dd86d98aedc14f20f00eeabdc1620ffded43cdb4c6b4009e96528bf1dae784256e40f034cd78d6460348b5
 EBUILD gitlab-shell-5.0.5.ebuild 3646 SHA256 aad0fca138202ef4f5e7885bf3edbe78fb0e524b263b7e770d4051b28e1cd5b1 SHA512 280fd3dc3da459882344eeebf8937fec8eedf50580b1a1fd1759d9e61e85b418407d6a7264acca8926201e1b29dc401f1226d7dd0496a26783c6ec09b7a97e68 WHIRLPOOL 1590459dfce361c2d049f431fee9b6cff435ac06ba1a126fb76688c4d4e7100b848e9e1875d18620ff0036b58afe78a743ac55793f79ca9c6bb1dca231ba7b03
-EBUILD gitlab-shell-5.1.1.ebuild 3646 SHA256 137913363961638e2ef0178f5a4f024cec0e3f44b5c48fa1e1e9cc77bc1e93e0 SHA512 8995e8250f592bf11ff73e24bcef4beb74faf8932729f4702be237810f9ca320c56c9d1abead8c147099b894f0af22242bfcfaf6343367d7ed7baeb80abacba3 WHIRLPOOL f2974dd7604f6142caf75e23a625f77acba2e5928b8e4a96d6e1f10157d66ad013b85a45b1cdc58b1ab55765adc889545e4482d6a3d1163f112161f102171b4f
+EBUILD gitlab-shell-5.1.1.ebuild 3888 SHA256 c62a4f22fb2b27377f8b1f8ab721c48c3fbb1ded13a618b01dff0ed881505ca1 SHA512 6768c7021dc1cf08d03d92abfe0f03b3b741cdee4d2b98b64591548beff1e1ffd2b9d347a0bce19a6ab41975de18487aa8ebb6655f2f7e6c4f878e1183672544 WHIRLPOOL 338ece7de253f88123be40ca35a4164a09380489177dcbe2e714d342ca60221d31c621b4f061f28f348bd96dfbb0ab4515e33a75ae17e857a6e3767672d1f88c
-MISC ChangeLog 3333 SHA256 8b9d10449391567a3d4bc9cda46281ab816f158c5a42e13a1282186dce2aab8d SHA512 358944659e77ccbb768bf32573ab1c66b152fa096791f07bf192cddf575f255a1dcc8d196cffeb09d94129bdd1ade7bd4ba035d3ca443e464e6c37915eac7354 WHIRLPOOL a5b9bb8773cafbb8213c323e5a8e8c8b403130de77cefe5418c956e85c84334d51ce157fd93af32b8da41971a0752bfe259996fce933d60bbe74a3c740556d7f
+MISC ChangeLog 3631 SHA256 dd999a5cc8d13913fa85264c06160c44a3498ff578a4d75dab0146f3250a35b4 SHA512 2b09b64c479039623f65af574b2994ff630b8e2ca1fe0623852b3506ba8e3189935a3c934bb68ee4d4c21d039833a466e2cd8532fe3eed961a1be5af7717e163 WHIRLPOOL 9cd95632767463940941e246bad52cb0f028d5de47bf01ad56a41a429828d85450292e7c7b80ed4938e21ec332bbbf944e1479d3d1d1d39b05fcf654603dad56
 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1

dev-vcs/gitlab-shell/files/0001-gitlab-shell-4.1.1-config-paths.patch

@@ -0,0 +1,69 @@
+diff --git a/config.yml.example b/config.yml.example
+index cf6c91b..7e144fe 100644
+--- a/config.yml.example
++++ b/config.yml.example
+@@ -25,15 +25,15 @@ http_settings:
+   self_signed_cert: false
+ 
+ # File used as authorized_keys for gitlab user
+-auth_file: "/home/git/.ssh/authorized_keys"
++auth_file: "/var/lib/git/.ssh/authorized_keys"
+ 
+ # File that contains the secret key for verifying access to GitLab.
+-# Default is .gitlab_shell_secret in the gitlab-shell directory.
+-# secret_file: "/home/git/gitlab-shell/.gitlab_shell_secret"
++# Default is /opt/gitlab/.gitlab_shell_secret.
++# secret_file: "/opt/gitlab/.gitlab_shell_secret"
+ 
+ # Parent directory for global custom hook directories (pre-receive.d, update.d, post-receive.d)
+ # Default is hooks in the gitlab-shell directory.
+-# custom_hooks_dir: "/home/git/gitlab-shell/hooks"
++# custom_hooks_dir: "/usr/share/gitlab-shell/hooks"
+ 
+ # Redis settings used for pushing commit notices to gitlab
+ redis:
+@@ -55,7 +55,7 @@ redis:
+ 
+ # Log file.
+ # Default is gitlab-shell.log in the root directory.
+-# log_file: "/home/git/gitlab-shell/gitlab-shell.log"
++log_file: "/var/log/gitlab/gitlab-shell.log"
+ 
+ # Log level. INFO by default
+ log_level: INFO
+diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
+index a51a32c..7763802 100644
+--- a/lib/gitlab_config.rb
++++ b/lib/gitlab_config.rb
+@@ -4,11 +4,11 @@ class GitlabConfig
+   attr_reader :config
+ 
+   def initialize
+-    @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml'))
++    @config = YAML.load_file('/etc/gitlab-shell.yml')
+   end
+ 
+   def home
+-    ENV['HOME']
++    "/var/lib/git"
+   end
+ 
+   def auth_file
+@@ -16,7 +16,7 @@ class GitlabConfig
+   end
+ 
+   def secret_file
+-    @config['secret_file'] ||= File.join(ROOT_PATH, '.gitlab_shell_secret')
++    @config['secret_file'] ||= "/opt/gitlab/.gitlab_shell_secret"
+   end
+ 
+   # Pass a default value because this is called from a repo's context; in which
+@@ -43,7 +43,7 @@ class GitlabConfig
+   end
+ 
+   def log_file
+-    @config['log_file'] ||= File.join(ROOT_PATH, 'gitlab-shell.log')
++    @config['log_file'] ||= "/var/log/gitlab/gitlab-shell.log"
+   end
+ 
+   def log_level

dev-vcs/gitlab-shell/files/0002-gitlab-shell-5.1.1-Makefile.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 2a78178..3b2780a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,8 @@ REDIS_RB_VENDOR_DIR=lib/vendor/redis
+ PWD=`pwd`
+ 
+ all:
++	bin/compile
++	strip -s bin/gitaly-*
+ 
+ update-redis:
+ 	rm -rf $(REDIS_RB_VENDOR_DIR)

dev-vcs/gitlab-shell/gitlab-shell-5.1.1.ebuild

@@ -21,6 +21,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm ~arm64"
 IUSE=""
 
+CDEPEND=">=dev-lang/go-1.8.3"
 DEPEND=""
 RDEPEND="
 	>=dev-vcs/git-2.7.4
@@ -32,7 +33,8 @@ ruby_add_bdepend "
 MERGE_TYPE="binary"
 
 RUBY_PATCHES=(
-	"${PN}-4.1.1-config-paths.patch"
+	"0001-${PN}-4.1.1-config-paths.patch"
+	"0002-${PN}-5.1.1-Makefile.patch"
 )
 
 GIT_USER="git"
@@ -67,6 +69,10 @@ all_ruby_prepare() {
 		lib/gitlab_config.rb || die "failed to filter gitlab_config.rb"
 }
 
+all_ruby_compile() {
+	emake all
+}
+
 all_ruby_install() {
 	# install lib
 	insinto ${DEST_DIR}; doins -r lib LICENSE README.md VERSION
@@ -87,7 +93,11 @@ all_ruby_install() {
 	# create symlink for .gitlab_shell_secret
 	einfo "creating symlink for .gitlab_shell_secret"
 	TOKEN_FILE="${DEST_DIR}/.gitlab_shell_secret"
-	dosym /opt/gitlab/.gitlab_shell_secret "$TOKEN_FILE"
+	dosym /opt/gitlab/.gitlab_shell_secret "${TOKEN_FILE}"
+
+	# Gitaly stupidly hardcodes the path to config.yml :(
+	MY_CONF_FILE="${DEST_DIR}/config.yml"
+	dosym "${CONF_FILE}" "${MY_CONF_FILE}"
 
 	# prepare directories
 	diropts -m750; dodir ${DATA_DIR}