[arch-commits] Commit in gitlab-shell/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, December 23, 2018 @ 00:31:31
  Author: svenstaro
Revision: 417578

upgpkg: gitlab-shell 2:8.4.4-1

This version also uses the default ruby at version 2.5 instead of ruby2.3.

Modified:
  gitlab-shell/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-23 00:15:54 UTC (rev 417577)
+++ PKGBUILD	2018-12-23 00:31:31 UTC (rev 417578)
@@ -6,8 +6,12 @@
 # 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.3
+pkgver=8.4.4
 pkgrel=1
 epoch=2
 pkgdesc="Git management software"
@@ -14,7 +18,7 @@
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-shell/"
 license=('MIT')
-depends=('ruby2.3' 'redis' 'git')
+depends=('ruby' 'redis' 'git')
 makedepends=('go-pie')
 options=('!strip')
 install=gitlab-shell.install
@@ -25,12 +29,10 @@
         "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"
-        252.patch)
-sha512sums=('cba44e70ae578af3da19aa8b8be18f05192326bfae06ba8f58dc46f77209696ae4e22c69f62f413c15af34fd0ce531a6dc4fc3ce591420d458ceb7190336ebea'
+        "gitlab-shell.sysusers")
+sha512sums=('518b44fe29aaf16c35694446da4a6c1fc175c65993600a668d5bd90cb7c3993c0bc4bd1d47619fd14c3bc4339270bd291d7d7051a69845a36a995a9738f589d8'
             '5caafe5300621ced58479e724b39656afc17f32a64ecde5dfa4919683ef37d9121552c78f066678472acb56e0a34b5c3cf34d9b44414d1ed5d91f725d180fa43'
-            '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8'
-            'd8f24575a3ff848c2eb1b8c32f98942377d17729a874048a3a1ab97f8bdbbca556fe0e8c1e87ef301aa3abd7b3a62fb414a46d99cd346dde51b792e4622d2a49')
+            '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"
@@ -41,8 +43,6 @@
 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\"|" \
@@ -50,10 +50,6 @@
       -e "s|# port:|port:|" \
       -e "s|socket:|# socket:|" \
       config.yml.example > config.yml
-
-  for file in {bin,hooks}/*; do
-    sed -i s/ruby/ruby-2.3/g ${file}
-  done
 }
 
 build() {