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

[Anatol Pomozov]

    Date: Friday, October 23, 2020 @ 21:52:55
  Author: anatolik
Revision: 730923

upgpkg: gitlab-shell 2:13.11.0-1

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

---------------+
 PKGBUILD      |    8 ++++----
 configs.patch |   16 ++++++++++------
 2 files changed, 14 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-23 21:52:28 UTC (rev 730922)
+++ PKGBUILD	2020-10-23 21:52:55 UTC (rev 730923)
@@ -12,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.7.0
+pkgver=13.11.0
 pkgrel=1
 epoch=2
 pkgdesc="Git management software"
@@ -30,8 +30,8 @@
         "configs.patch"
         "gitlab-shell.gitconfig"
         "gitlab-shell.sysusers")
-sha512sums=('1ef6587e2824d802e230d8824c210d0197ebe8b3f3fbe644d0a29411eeb34e6f78f5bca75c3acaadab7f0a14d9f7d45f8868e55bd01d1e3a85cbbcac6d24ea9a'
-            '49c5f15eeb985f402296faa991315311596ebf527b1fe715e94852c7048c767ccd69da3b42ddf3ebd45b86838ec72389d68a2204764f432ae5e9ce1651ff1966'
+sha512sums=('48e6846d72af94ee68e5e35f6856c6dd12402a65586a4fedc70aaf30725e9ebf35a5c95ef579178fff3d2a30cf414e5dea922a2994ac67b0ac0fe456c27fdf08'
+            '13c0fb88693e787f2960059985713d7ffb6d2fa51d9dbcba9c9562ae91e74bd3963efc63837cd19c5441fb5835d0c8eafd3285bea6676168f7b111a08fb086a7'
             'cb8003f2ce8013fcd807aae6d66c22c3a767e74d569bd69aaa5a54b84a36135d25b3af57861f858f8f407e089ff69ff5c325bf065c6051ce8fa197fab70470b8'
             '616188911fa7b7c569bc2d5e2024177e67366c48b4ffef1f7ad4dc8e4e9e2cdb421b687f45a1e9bdec8bf2736a157ca9f1e0ba24edae2f073b8c7b5ac42745e8')
 
@@ -86,7 +86,7 @@
   install -Dm644 config.yml.example "${pkgdir}${_etcdir}/config.yml"
   ln -fs "${_etcdir}/config.yml" "${pkgdir}${_datadir}/config.yml"
 
-  cp -r VERSION bin hooks spec support "${pkgdir}${_datadir}"
+  cp -r VERSION bin spec support "${pkgdir}${_datadir}"
   ln -fs "${_datadir}" "${pkgdir}/${_homedir}/"
 
   # Compatibility for FS#64251

Modified: configs.patch
===================================================================
--- configs.patch	2020-10-23 21:52:28 UTC (rev 730922)
+++ configs.patch	2020-10-23 21:52:55 UTC (rev 730923)
@@ -1,4 +1,4 @@
-commit 1621cfc0cb80493412dc43841ab48781630e481a
+commit 91264d5a92bbc464f77fac14e3076e7264cf6513
 Author: Anatol Pomozov <anatol.pomozov at gmail.com>
 Date:   Tue May 26 00:39:46 2020 -0700
 
@@ -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 60435a3..5001cc2 100644
+index 645cb88..b99e965 100644
 --- a/config.yml.example
 +++ b/config.yml.example
 @@ -4,7 +4,7 @@
@@ -34,9 +34,9 @@
 -gitlab_url: "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
 +gitlab_url: "http+unix://%2Frun%2Fgitlab%2Fgitlab-workhorse.socket"
  
- # See installation.md#using-https for additional HTTPS configuration details.
- http_settings:
-@@ -25,7 +25,7 @@ http_settings:
+ # When a http+unix:// is used in gitlab_url, this is the relative URL root to GitLab.
+ # Not used if gitlab_url is http:// or https://.
+@@ -29,7 +29,7 @@ http_settings:
    self_signed_cert: false
  
  # File used as authorized_keys for gitlab user
@@ -45,12 +45,16 @@
  
  # 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"
+@@ -37,7 +37,7 @@ 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"
 +secret_file: "/var/lib/gitlab/gitlab-shell/.gitlab_shell_secret"
+ #
+ # The secret field supersedes the secret_file, and if set that
+ # file will not be read.
+@@ -45,7 +45,7 @@ auth_file: "/home/git/.ssh/authorized_keys"
  
  # Log file.
  # Default is gitlab-shell.log in the root directory.