[arch-commits] Commit in gitlab-gitaly/trunk (PKGBUILD configs.patch)
Anatol Pomozov
anatolik at archlinux.org
Mon Oct 26 18:53:50 UTC 2020
Date: Monday, October 26, 2020 @ 18:53:50
Author: anatolik
Revision: 734021
upgpkg: gitlab-gitaly 13.5.1-1
Modified:
gitlab-gitaly/trunk/PKGBUILD
gitlab-gitaly/trunk/configs.patch
---------------+
PKGBUILD | 8 ++++----
configs.patch | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-26 18:34:13 UTC (rev 734020)
+++ PKGBUILD 2020-10-26 18:53:50 UTC (rev 734021)
@@ -4,7 +4,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-gitaly
-pkgver=13.3.4
+pkgver=13.5.1
pkgrel=1
pkgdesc="Speed up Git access using caching"
arch=('x86_64')
@@ -12,14 +12,14 @@
license=('MIT')
depends=(glibc ruby libxml2 libxslt libssh2)
options=(!buildflags)
-makedepends=(go ruby-bundler cmake)
+makedepends=(go ruby-bundler cmake git)
backup=("etc/gitlab-gitaly/config.toml")
_tag=v${pkgver}
source=("https://gitlab.com/gitlab-org/gitaly/-/archive/${_tag}/gitaly-${_tag}.tar.gz"
"configs.patch"
"gitlab-gitaly.service")
-sha512sums=('4d4dfa3902df518c00d97f0f62a401d903505058fca3f8007d53b59a673d3187764cf59d3e49a67a1e37ea9a26e26b7ebf26332d6d8e3784cb1cd930f865e16a'
- '6565b3dbed2653c31d5a49043dd8227812d9c8a1f6d716ed65fed5878b9c9bd6def84e8b00ff23ddb37d8bf2f484ecb229dcb1528e8276fff7fbbb1099790850'
+sha512sums=('0295ff617052c02af1fa69a249d488f0b7f225f8824894fe289b76d9f0cf40589db45e98825ccaee9450cf39c2368b6d22ca40a7bb8368dca2446effee52459e'
+ '1b83abe2034a195c33a6dbb7907f93d33b53bd94dc983be5dee5533a1e61cc41fd5228e04dcd2b2576a87a371bf5ab7c81212262421ee7c6ec46c949da4c1153'
'7f5cd528c873a5e43e18aa6a88bd7298422c047e0e61cf3208be7d9fcfdfdc8a844b5c439ab6afc2098c5c4c60ed9c3d167c2f87517f1e93b34f39be3d3dad09')
prepare() {
Modified: configs.patch
===================================================================
--- configs.patch 2020-10-26 18:34:13 UTC (rev 734020)
+++ configs.patch 2020-10-26 18:53:50 UTC (rev 734021)
@@ -1,4 +1,4 @@
-commit 487d724f098441298088e59805af2faba7843fbe
+commit 438448e3b000359b1c9ec16d2918605888f5903e
Author: Anatol Pomozov <anatol.pomozov at gmail.com>
Date: Tue May 26 00:26:02 2020 -0700
@@ -15,7 +15,7 @@
will cause a conflict that needs to be reviewed manually.
diff --git a/config.toml.example b/config.toml.example
-index 85fbf6ba..9f8e6c99 100644
+index befe90a3..d4317462 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -2,10 +2,10 @@
@@ -94,6 +94,6 @@
-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
+secret_file = "/etc/webapps/gitlab-shell/secret"
+url = "http+unix://%2Frun%2Fgitlab%2Fgitlab.socket"
-
- [gitlab.http-settings]
- # read_timeout = 300
+ # Only needed if a UNIX socket is used in `url` and GitLab is configured to
+ # use a relative path (e.g. /gitlab).
+ # relative_url_root = '/'
More information about the arch-commits
mailing list