[arch-commits] Commit in gitlab-shell/repos (6 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Dec 23 00:31:36 UTC 2018
Date: Sunday, December 23, 2018 @ 00:31:34
Author: svenstaro
Revision: 417579
archrelease: copy trunk to community-staging-x86_64
Added:
gitlab-shell/repos/community-staging-x86_64/
gitlab-shell/repos/community-staging-x86_64/252.patch
(from rev 417578, gitlab-shell/trunk/252.patch)
gitlab-shell/repos/community-staging-x86_64/PKGBUILD
(from rev 417578, gitlab-shell/trunk/PKGBUILD)
gitlab-shell/repos/community-staging-x86_64/gitlab-shell.gitconfig
(from rev 417578, gitlab-shell/trunk/gitlab-shell.gitconfig)
gitlab-shell/repos/community-staging-x86_64/gitlab-shell.install
(from rev 417578, gitlab-shell/trunk/gitlab-shell.install)
gitlab-shell/repos/community-staging-x86_64/gitlab-shell.sysusers
(from rev 417578, gitlab-shell/trunk/gitlab-shell.sysusers)
------------------------+
252.patch | 31 +++++++++++++++
PKGBUILD | 97 +++++++++++++++++++++++++++++++++++++++++++++++
gitlab-shell.gitconfig | 5 ++
gitlab-shell.install | 4 +
gitlab-shell.sysusers | 1
5 files changed, 138 insertions(+)
Copied: gitlab-shell/repos/community-staging-x86_64/252.patch (from rev 417578, gitlab-shell/trunk/252.patch)
===================================================================
--- community-staging-x86_64/252.patch (rev 0)
+++ community-staging-x86_64/252.patch 2018-12-23 00:31:34 UTC (rev 417579)
@@ -0,0 +1,31 @@
+From 2ae15257494d925d67c40ac2af00da127079ae42 Mon Sep 17 00:00:00 2001
+From: Vlad Petrov <ejiek at mail.ru>
+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
+
Copied: gitlab-shell/repos/community-staging-x86_64/PKGBUILD (from rev 417578, gitlab-shell/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2018-12-23 00:31:34 UTC (rev 417579)
@@ -0,0 +1,97 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Pavol (Lopo) Hluchy <lopo AT losys DOT eu>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Jonas Heinrich <onny at project-insnaity.org>
+# Contributor: Lee Watson <aur at revthefox.co.uk>
+# Contributor: Tobias Hunger <tobias DOT hunger AT gmail DOT com>
+# Contributor: Stefan Tatschner <stefan at sevenbyte.org>
+
+
+# NOTE: Gitlab isn't always compatible with modern Ruby versions. In that case, check the
+# commit log for an old fix on how to tell it to use older versions of Ruby. I'm afraid we'll
+# need this again at some point in the future.
+pkgname=gitlab-shell
+pkgver=8.4.4
+pkgrel=1
+epoch=2
+pkgdesc="Git management software"
+arch=('x86_64')
+url="https://gitlab.com/gitlab-org/gitlab-shell/"
+license=('MIT')
+depends=('ruby' 'redis' 'git')
+makedepends=('go-pie')
+options=('!strip')
+install=gitlab-shell.install
+backup=("etc/webapps/${pkgname}/config.yml"
+ "etc/webapps/${pkgname}/secret"
+ "etc/webapps/${pkgname}/gitconfig"
+ "etc/webapps/${pkgname}/authorized_keys"
+ "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")
+sha512sums=('518b44fe29aaf16c35694446da4a6c1fc175c65993600a668d5bd90cb7c3993c0bc4bd1d47619fd14c3bc4339270bd291d7d7051a69845a36a995a9738f589d8'
+ '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43'
+ '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
+
+_datadir="/usr/share/webapps/${pkgname}"
+_etcdir="/etc/webapps/${pkgname}"
+_homedir="/var/lib/gitlab"
+_logdir="/var/log/gitlab"
+_srcdir="gitlab-shell-v${pkgver}"
+
+prepare() {
+ cd "${srcdir}/${_srcdir}"-*
+
+ sed -e "s|user: git|user: gitlab|" \
+ -e "s|/home/git|${_homedir}|" \
+ -e "s|# log_file: .*|log_file: \"${_logdir}/gitlab-shell.log\"|" \
+ -e "s|# host:|host:|" \
+ -e "s|# port:|port:|" \
+ -e "s|socket:|# socket:|" \
+ config.yml.example > config.yml
+}
+
+build() {
+ cd "${srcdir}/${_srcdir}"-*
+
+ ./bin/compile
+}
+
+package() {
+ cd "${srcdir}/${_srcdir}"-*
+
+ install -dm755 -o root -g root "${pkgdir}${_datadir}"
+ install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}"
+ install -dm750 -o 105 -g 105 "${pkgdir}${_homedir}/satellites"
+ install -dm700 -o 105 -g 105 "${pkgdir}${_homedir}/.ssh"
+ install -dm750 -o 105 -g 105 "${pkgdir}${_etcdir}"
+ install -dm770 -o 105 -g root "${pkgdir}${_logdir}"
+
+ # sysusers
+ install -Dm644 "${srcdir}/gitlab-shell.sysusers" "${pkgdir}/usr/lib/sysusers.d/gitlab-shell.conf"
+
+ # .gitconfig
+ install -Dm644 -o 105 -g 105 "${srcdir}/gitlab-shell.gitconfig" "${pkgdir}${_etcdir}/.gitconfig"
+ ln -fs "${_etcdir}/.gitconfig" "${pkgdir}${_homedir}/.gitconfig"
+
+ # .gitlab_shell_secret
+ touch "${pkgdir}${_etcdir}/secret"
+ chmod 640 "${pkgdir}${_etcdir}/secret"
+ chown root:105 "${pkgdir}${_etcdir}/secret"
+ ln -fs "${_etcdir}/secret" "${pkgdir}${_datadir}/.gitlab_shell_secret"
+
+ # config.yml
+ mv config.yml "${pkgdir}${_etcdir}"
+ ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml"
+
+ cp -r VERSION bin hooks lib spec support "${pkgdir}${_datadir}"
+ ln -fs "${_datadir}" "${pkgdir}/${_homedir}/"
+
+ install -dm2770 -o 105 -g 105 "${pkgdir}${_homedir}/repositories"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gitlab-shell/repos/community-staging-x86_64/gitlab-shell.gitconfig (from rev 417578, gitlab-shell/trunk/gitlab-shell.gitconfig)
===================================================================
--- community-staging-x86_64/gitlab-shell.gitconfig (rev 0)
+++ community-staging-x86_64/gitlab-shell.gitconfig 2018-12-23 00:31:34 UTC (rev 417579)
@@ -0,0 +1,5 @@
+[user]
+ name = GitLab
+ email = gitlab at localhost
+[core]
+ autocrlf = input
Copied: gitlab-shell/repos/community-staging-x86_64/gitlab-shell.install (from rev 417578, gitlab-shell/trunk/gitlab-shell.install)
===================================================================
--- community-staging-x86_64/gitlab-shell.install (rev 0)
+++ community-staging-x86_64/gitlab-shell.install 2018-12-23 00:31:34 UTC (rev 417579)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "Configure gitlab-shell in /etc/webapps/gitlab-shell/config.yml"
+ echo "Put a secret bytestring to /etc/webapps/gitlab-shell/secret"
+}
Copied: gitlab-shell/repos/community-staging-x86_64/gitlab-shell.sysusers (from rev 417578, gitlab-shell/trunk/gitlab-shell.sysusers)
===================================================================
--- community-staging-x86_64/gitlab-shell.sysusers (rev 0)
+++ community-staging-x86_64/gitlab-shell.sysusers 2018-12-23 00:31:34 UTC (rev 417579)
@@ -0,0 +1 @@
+u gitlab 105 - /var/lib/gitlab /usr/share/webapps/gitlab-shell/bin/gitlab-shell
More information about the arch-commits
mailing list