[arch-commits] Commit in gitlab/trunk (PKGBUILD update-re2-to-1.2.0.patch)

[Evangelos Foutras]

    Date: Thursday, May 7, 2020 @ 15:02:38
  Author: foutrelis
Revision: 625434

upgpkg: gitlab 12.10.2-2: re2 20200501 rebuild

Added:
  gitlab/trunk/update-re2-to-1.2.0.patch
Modified:
  gitlab/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    5 +++-
 update-re2-to-1.2.0.patch |   45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-07 14:55:47 UTC (rev 625433)
+++ PKGBUILD	2020-05-07 15:02:38 UTC (rev 625434)
@@ -11,7 +11,7 @@
 # need this again at some point in the future.
 pkgname=gitlab
 pkgver=12.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-foss"
@@ -30,6 +30,7 @@
         "etc/logrotate.d/gitlab")
 source=(git+https://gitlab.com/gitlab-org/gitlab-foss.git#tag=v$pkgver
         build_fix.patch
+        update-re2-to-1.2.0.patch
         gitlab-unicorn.service
         gitlab-puma.service
         gitlab-sidekiq.service
@@ -43,6 +44,7 @@
 install='gitlab.install'
 sha512sums=('SKIP'
             '9623de113358d3d6e49047f688e272d9394579734ace1bd647497e8717a90784546d27e547a29197a16c80d72ad9f2c79eb65f8edc631deadf2ec90ee86ea44b'
+            '556ad2b9561839b9de5bbd8cb4ebfd5dafe1c43257491ee77fed16106440021b97d252ffeec235da71741e56b657c4d53ef25bb15d58ec49a4f82f21cdf899c2'
             '1ad15b48890ad48e97a6fcea56132582f2b22aa27f4a1a1f4590f3ea72de4726e13ef6f3db2bc0984da1ef140bde092e74e0c9f8f1778f207f3fac4a31a77e4b'
             '9fcc8934a9e927838eb5b496a462b4895dfbbd5f65e14513c600c35356f1687fbfcfb43b5a6e580ccba38df826da462fc2f0b0406a86a48b9ff90afab7a1122f'
             '8ca36771f7568b190823ec47afeaf6ff75f61c5b6f31ce5d837a6dcd84a5b3da23fb07a1eceeda0752b2e61c4a8f4d17bf368fa2913e1487567944a8d29eeb58'
@@ -67,6 +69,7 @@
   cd gitlab-foss
 
   patch -p1 < ../build_fix.patch
+  patch -p1 < ../update-re2-to-1.2.0.patch
 
   # GitLab tries to read its revision information from a file.
   echo "${revision}" > REVISION

Added: update-re2-to-1.2.0.patch
===================================================================
--- update-re2-to-1.2.0.patch	                        (rev 0)
+++ update-re2-to-1.2.0.patch	2020-05-07 15:02:38 UTC (rev 625434)
@@ -0,0 +1,45 @@
+From b63f3afa42a43e2a261a989f87e9ccd1e18caaa5 Mon Sep 17 00:00:00 2001
+From: GitLab Bot <gitlab-bot at gitlab.com>
+Date: Sat, 2 May 2020 18:09:45 +0000
+Subject: [PATCH] Add latest changes from gitlab-org/gitlab at master
+
+---
+ Gemfile                     | 2 +-
+ Gemfile.lock                | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Gemfile b/Gemfile
+index 6bd15a9a190..18d8e4586bd 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -204,7 +204,7 @@ gem 'ruby-progressbar'
+ gem 'settingslogic', '~> 2.0.9'
+ 
+ # Linear-time regex library for untrusted regular expressions
+-gem 're2', '~> 1.1.1'
++gem 're2', '~> 1.2.0'
+ 
+ # Misc
+ 
+diff --git a/Gemfile.lock b/Gemfile.lock
+index e796144f62a..eb1a0eb5a27 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -854,7 +854,7 @@ GEM
+       msgpack (>= 0.4.3)
+       optimist (>= 3.0.0)
+     rdoc (6.1.2)
+-    re2 (1.1.1)
++    re2 (1.2.0)
+     recaptcha (4.13.1)
+       json
+     recursive-open-struct (1.1.0)
+@@ -1346,7 +1346,7 @@ DEPENDENCIES
+   rblineprof (~> 0.3.6)
+   rbtrace (~> 0.4)
+   rdoc (~> 6.1.2)
+-  re2 (~> 1.1.1)
++  re2 (~> 1.2.0)
+   recaptcha (~> 4.11)
+   redis (~> 4.0)
+   redis-namespace (~> 1.6.0)