[arch-commits] Commit in gitlab/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Saturday, May 12, 2018 @ 00:51:46
  Author: svenstaro
Revision: 320915

upgpkg: gitlab 10.7.3-1

Added:
  gitlab/trunk/b41b2de702c26bfbbe375c70c48293a75546df42.patch
Modified:
  gitlab/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |   15 ++---
 b41b2de702c26bfbbe375c70c48293a75546df42.patch |   68 +++++++++++++++++++++++
 2 files changed, 76 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-11 23:16:47 UTC (rev 320914)
+++ PKGBUILD	2018-05-12 00:51:46 UTC (rev 320915)
@@ -7,7 +7,7 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=gitlab
-pkgver=10.7.1
+pkgver=10.7.3
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -33,9 +33,10 @@
         gitlab-backup.timer
         gitlab.target
         gitlab.tmpfiles.d
-        gitlab.logrotate)
+        gitlab.logrotate
+        b41b2de702c26bfbbe375c70c48293a75546df42.patch)
 install='gitlab.install'
-sha512sums=('2a24782352b1dc0fd3eaea1cb85bc08a7c7e9328075d2f85a55b4c6e772793dbc3d555219d82c0c781b70557a3cc2160564de86c45bdca852025efd24575218b'
+sha512sums=('eeeba68bd66fccffe0d638b5f5328efe8b662c8300d7c4bf122346178bb15001414a374788ba7b2aa25f354dd2def568b20b708d3b1da36fe7ed2bc1c3aa320b'
             'e96364b3373420a0704552584264f42fee23d64d44d3f769dffa6b516ea9d4c09873da8b2a279445ae9a09f17f81628815efc83e8d0070b3246e56aa13c02ac6'
             '1104db0397ae5f9a69452ea2a432b837cfaf37d72d063226c2156de5f753b5ae42be1f90292c34f27e251ce3d265ac9c1f79faad1d377c923e7dbc6744100471'
             'bfc98f3890dfbe11a6f7fa3275f2b04b54b8e31455dcf70abfdc7f1021ff9acb1243f7af8381465346cd780bc76fa2b1c80fada860b8c3c87c7c56bb5229c1ee'
@@ -43,7 +44,8 @@
             'c11d2c59da8325551a465227096e8d39b0e4bcd5b1db21565cf3439e431838c04bc00aa6f07f4d493f3f47fd6b4e25aeb0fe0fc1a05756064706bf5708c960ec'
             'bf33b818e4ea671c16f58563997ba5fe0a09090e5c03577ff974d31324d4e9782b85a9bb4f1749b97257ce93400c692de935f003770d52b5994c9cab9aee57c6'
             'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3'
-            '20b93eab504e82cc4401685b59e6311b4d2c0285bc594d47ce4106d3f418a3e2ba92c4f49732748c0ba913aa3e3299126166e37d2a2d5b4d327d66bae4b8abda')
+            '20b93eab504e82cc4401685b59e6311b4d2c0285bc594d47ce4106d3f418a3e2ba92c4f49732748c0ba913aa3e3299126166e37d2a2d5b4d327d66bae4b8abda'
+            '32c432bf5e45be7b63e078335deaab5d05f8c0e78da891038cc607beed75c670f4c825138bb2c6ba0b4cf879ef45f5cbeb12cebd4fa63d7f58362960788c9e72')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"
@@ -59,6 +61,8 @@
 
   cd "${_srcdir}"*
 
+  patch -Np1 -i "${srcdir}"/b41b2de702c26bfbbe375c70c48293a75546df42.patch
+
   msg2 "Patching git revision in config/initializers/2_app.rb..."
   sed -i -e "s|REVISION = Gitlab::Popen.popen(%W(#{config.git.bin_path} log --pretty=format:%h -n 1)).first.chomp.freeze|REVISION = \"${revision}\"|" \
             config/initializers/2_app.rb
@@ -203,9 +207,6 @@
 
   install -Dm644 "${srcdir}/gitlab.tmpfiles.d" "${pkgdir}/usr/lib/tmpfiles.d/gitlab.conf"
   install -Dm644 "${srcdir}/gitlab.logrotate" "${pkgdir}/etc/logrotate.d/gitlab"
-
-  # Fix FS#58292
-  chmod 644 "${pkgdir}"/usr/share/webapps/gitlab/vendor/bundle/ruby/2.3.0/gems/omniauth-jwt-0.0.2/lib/omniauth/strategies/jwt.rb
 }
 
 # vim:set ts=2 sw=2 et:

Added: b41b2de702c26bfbbe375c70c48293a75546df42.patch
===================================================================
--- b41b2de702c26bfbbe375c70c48293a75546df42.patch	                        (rev 0)
+++ b41b2de702c26bfbbe375c70c48293a75546df42.patch	2018-05-12 00:51:46 UTC (rev 320915)
@@ -0,0 +1,68 @@
+From b41b2de702c26bfbbe375c70c48293a75546df42 Mon Sep 17 00:00:00 2001
+From: Mike Greiling <mike at pixelcog.com>
+Date: Wed, 9 May 2018 07:54:16 -0500
+Subject: [PATCH] bump upath dependency to a version compatible with node 10
+
+---
+ yarn.lock | 25 ++-----------------------
+ 1 file changed, 2 insertions(+), 23 deletions(-)
+
+diff --git a/yarn.lock b/yarn.lock
+index d3d04fa..8507dd7 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -5406,10 +5406,6 @@ lodash.deburr@^4.0.0:
+   version "4.1.0"
+   resolved "https://registry.yarnpkg.com/lodash.deburr/-/lodash.deburr-4.1.0.tgz#ddb1bbb3ef07458c0177ba07de14422cb033ff9b"
+ 
+-lodash.endswith@^4.2.1:
+-  version "4.2.1"
+-  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
+-
+ lodash.escaperegexp@^4.1.2:
+   version "4.1.2"
+   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
+@@ -5425,14 +5421,6 @@ lodash.isarray@^3.0.0:
+   version "3.0.4"
+   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
+ 
+-lodash.isfunction@^3.0.8:
+-  version "3.0.9"
+-  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
+-
+-lodash.isstring@^4.0.1:
+-  version "4.0.1"
+-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+-
+ lodash.kebabcase at 4.0.1:
+   version "4.0.1"
+   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.0.1.tgz#5e63bc9aa2a5562ff3b97ca7af2f803de1bcb90e"
+@@ -5455,10 +5443,6 @@ lodash.snakecase at 4.0.1:
+     lodash.deburr "^4.0.0"
+     lodash.words "^4.0.0"
+ 
+-lodash.startswith@^4.2.1:
+-  version "4.2.1"
+-  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
+-
+ lodash.uniq@^4.5.0:
+   version "4.5.0"
+   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+@@ -8787,13 +8771,8 @@ unzip-response@^2.0.1:
+   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
+ 
+ upath@^1.0.0:
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.2.tgz#80aaae5395abc5fd402933ae2f58694f0860204c"
+-  dependencies:
+-    lodash.endswith "^4.2.1"
+-    lodash.isfunction "^3.0.8"
+-    lodash.isstring "^4.0.1"
+-    lodash.startswith "^4.2.1"
++  version "1.0.5"
++  resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.5.tgz#02cab9ecebe95bbec6d5fc2566325725ab6d1a73"
+ 
+ update-notifier@^2.3.0:
+   version "2.3.0"
+--
+libgit2 0.27.0