Date: Sunday, April 1, 2018 @ 19:03:38 Author: svenstaro Revision: 313750
upgpkg: gitlab-gitaly 0.92.0-2 Added: gitlab-gitaly/trunk/90cbe1dcdbd7439de7475394f8f20890ce68081b.patch Modified: gitlab-gitaly/trunk/PKGBUILD ------------------------------------------------+ 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch | 25 +++++++++++++++++++++++ PKGBUILD | 10 ++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) Added: 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch =================================================================== --- 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch (rev 0) +++ 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch 2018-04-01 19:03:38 UTC (rev 313750) @@ -0,0 +1,25 @@ +From 90cbe1dcdbd7439de7475394f8f20890ce68081b Mon Sep 17 00:00:00 2001 +From: Matija Čupić <[email protected]> +Date: Fri, 30 Mar 2018 18:23:07 +0200 +Subject: [PATCH] Bump charlock_holmes + +--- + ruby/Gemfile.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock +index 2b5287b..91efe4f 100644 +--- a/ruby/Gemfile.lock ++++ b/ruby/Gemfile.lock +@@ -9,7 +9,7 @@ GEM + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ast (2.3.0) +- charlock_holmes (0.7.5) ++ charlock_holmes (0.7.6) + concurrent-ruby (1.0.5) + diff-lcs (1.3) + escape_utils (1.1.1) +-- +libgit2 0.26.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-01 17:02:12 UTC (rev 313749) +++ PKGBUILD 2018-04-01 19:03:38 UTC (rev 313750) @@ -2,7 +2,7 @@ pkgname=gitlab-gitaly pkgver=0.92.0 -pkgrel=1 +pkgrel=2 pkgdesc="Speed up Git access using caching" arch=('x86_64') url="https://gitlab.com/gitlab-org/gitaly"; @@ -12,9 +12,11 @@ makedepends=(go ruby2.3-bundler cmake) backup=("etc/gitlab-gitaly/config.toml") source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/gitlab-org/gitaly/repository/archive.tar.gz?ref=v${pkgver}"; - "gitlab-gitaly.service") + "gitlab-gitaly.service" + 90cbe1dcdbd7439de7475394f8f20890ce68081b.patch) sha512sums=('29cf0adf944f4f3d5c7fc41ac4c89f97b7a8a07562bd19a80ba5aeffd7e3b66d75a2130e6191c423bd3a96b5f5bbb614916509100576e9927e4afba7470f4b1b' - 'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28') + 'b330c0f42592322ad2131079ca554a13a364007182dded8c556198caff2c9ec642acf5bb7dfecb05de5a3d89bffec6588b6d05c8c7c5c771a46df3d296deed28' + 'cad360f504b028468060474e7a8d68081f19aa9b5d95bf63206e64ad0484767f07af3298b63c12b5d4281ac775a30afe153531634a0f66bbc625c54e0cbfa273') _homedir="/var/lib/gitlab" @@ -21,6 +23,8 @@ prepare() { cd "gitaly-v${pkgver}-"* + patch -Np1 -i "${srcdir}"/90cbe1dcdbd7439de7475394f8f20890ce68081b.patch + sed -i "s/bundle install/bundle-2.3 install/" Makefile sed -i "s/bundle config/bundle-2.3 config/" Makefile sed -i "s/bundle/bundle-2.3/" internal/rubyserver/rubyserver.go
