Date: Monday, October 22, 2018 @ 01:59:00 Author: svenstaro Revision: 398301
upgpkg: gitlab-shell 2:8.4.0-2 Fix FS#60466 Added: gitlab-shell/trunk/252.patch Modified: gitlab-shell/trunk/PKGBUILD -----------+ 252.patch | 31 +++++++++++++++++++++++++++++++ PKGBUILD | 10 +++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) Added: 252.patch =================================================================== --- 252.patch (rev 0) +++ 252.patch 2018-10-22 01:59:00 UTC (rev 398301) @@ -0,0 +1,31 @@ +From 2ae15257494d925d67c40ac2af00da127079ae42 Mon Sep 17 00:00:00 2001 +From: Vlad Petrov <[email protected]> +Date: Tue, 16 Oct 2018 22:24:41 +0300 +Subject: [PATCH] Update current path extraction + +It is recommended to use func Executable since 1.8 +https://tip.golang.org/pkg/os/#Executable +--- + go/cmd/gitlab-shell/main.go | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/go/cmd/gitlab-shell/main.go b/go/cmd/gitlab-shell/main.go +index ae54151..b42aba7 100644 +--- a/go/cmd/gitlab-shell/main.go ++++ b/go/cmd/gitlab-shell/main.go +@@ -15,7 +15,11 @@ var ( + ) + + func init() { +- binDir = filepath.Dir(os.Args[0]) ++ ex, err := os.Executable() ++ if err != nil { ++ panic(err) ++ } ++ binDir = filepath.Dir(ex) + rootDir = filepath.Dir(binDir) + } + +-- +2.18.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-22 01:52:47 UTC (rev 398300) +++ PKGBUILD 2018-10-22 01:59:00 UTC (rev 398301) @@ -8,7 +8,7 @@ pkgname=gitlab-shell pkgver=8.4.0 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc="Git management software" arch=('x86_64') @@ -25,10 +25,12 @@ "etc/webapps/${pkgname}/") source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitlab-shell/repository/archive?sha=v${pkgver}"; "gitlab-shell.gitconfig" - "gitlab-shell.sysusers") + "gitlab-shell.sysusers" + 252.patch) sha512sums=('8fca70e905842382e3c3daa23cc5c025e176962aa230aac790c7a8e3ec33bdbae55b4b0822e3655b66cfd0ba055bc4dd5439a2e9abdd353de3d8b701cb829183' '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43' - '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8') + '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8' + 'd8f24575a3ff848c2eb1b8c32f98942377d17729a874048a3a1ab97f8bdbbca556fe0e8c1e87ef301aa3abd7b3a62fb414a46d99cd346dde51b792e4622d2a49') _datadir="/usr/share/webapps/${pkgname}" _etcdir="/etc/webapps/${pkgname}" @@ -39,6 +41,8 @@ prepare() { cd "${srcdir}/${_srcdir}"-* + patch -Np1 -i $srcdir/252.patch + sed -e "s|user: git|user: gitlab|" \ -e "s|/home/git|${_homedir}|" \ -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \
