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

[Anatol Pomozov]

    Date: Thursday, July 23, 2020 @ 19:29:19
  Author: anatolik
Revision: 665059

upgpkg: gitlab-shell 2:13.4.0-1

Modified:
  gitlab-shell/trunk/PKGBUILD
  gitlab-shell/trunk/configs.patch

---------------+
 PKGBUILD      |    9 +++++----
 configs.patch |   12 ++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-23 19:28:00 UTC (rev 665058)
+++ PKGBUILD	2020-07-23 19:29:19 UTC (rev 665059)
@@ -1,4 +1,5 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
+# Contributor: Sven-Hendrik Haase <svenstaro at gmail.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>
@@ -11,7 +12,7 @@
 # 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=13.3.0
+pkgver=13.4.0
 pkgrel=1
 epoch=2
 pkgdesc="Git management software"
@@ -29,8 +30,8 @@
         "configs.patch"
         "gitlab-shell.gitconfig"
         "gitlab-shell.sysusers")
-sha512sums=('f13b2c9ddb5f937f5f38097c94cd9f5ea7b02b2b0cdda3e0fa9285a789a47764a00f44017a39c377cde5c3528cce6a6a41af53e65e2ab8a55e20871ec6658b5a'
-            'ebb6f950a3ef47e187216f8a47d43d08dbe8a5883bd2d1d9aedd3b2f83b92dbbd0cdf733a331bbc8e130a45002bc99a7e4b31fa3b9fad21edea5f82dfbd80940'
+sha512sums=('3c151ce291b267f563aa625190b2dde00f93ac850087387e86229ead3640108f55788766f8a84973587637d3332f4287c6b8021e0ccaf5f43cfaea1616f65ba0'
+            '49c5f15eeb985f402296faa991315311596ebf527b1fe715e94852c7048c767ccd69da3b42ddf3ebd45b86838ec72389d68a2204764f432ae5e9ce1651ff1966'
             'cb8003f2ce8013fcd807aae6d66c22c3a767e74d569bd69aaa5a54b84a36135d25b3af57861f858f8f407e089ff69ff5c325bf065c6051ce8fa197fab70470b8'
             '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
 

Modified: configs.patch
===================================================================
--- configs.patch	2020-07-23 19:28:00 UTC (rev 665058)
+++ configs.patch	2020-07-23 19:29:19 UTC (rev 665059)
@@ -1,6 +1,6 @@
-commit e713b14a4c3344669da1702141abedc755b12f35
+commit 1621cfc0cb80493412dc43841ab48781630e481a
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
-Date:   Thu Jun 4 11:56:44 2020 -0700
+Date:   Tue May 26 00:39:46 2020 -0700
 
     Patch config files with Arch Linux specific locations
     
@@ -15,7 +15,7 @@
     will cause a conflict that needs to be reviewed manually.
 
 diff --git a/config.yml.example b/config.yml.example
-index c2c1027..e34dcac 100644
+index 60435a3..5001cc2 100644
 --- a/config.yml.example
 +++ b/config.yml.example
 @@ -4,7 +4,7 @@
@@ -36,7 +36,7 @@
  
  # See installation.md#using-https for additional HTTPS configuration details.
  http_settings:
-@@ -25,15 +25,15 @@ http_settings:
+@@ -25,7 +25,7 @@ http_settings:
    self_signed_cert: false
  
  # File used as authorized_keys for gitlab user
@@ -43,6 +43,10 @@
 -auth_file: "/home/git/.ssh/authorized_keys"
 +auth_file: "/var/lib/gitlab/.ssh/authorized_keys"
  
+ # SSL certificate dir where custom certificates can be placed
+ # https://golang.org/pkg/crypto/x509/
+@@ -33,11 +33,11 @@ auth_file: "/home/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"