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

[Sven-Hendrik Haase]

    Date: Thursday, August 23, 2018 @ 10:40:36
  Author: svenstaro
Revision: 373390

upgpkg: gitlab 11.2.1-1

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

------------------------------------------------+
 PKGBUILD                                       |   12 ++--
 b41b2de702c26bfbbe375c70c48293a75546df42.patch |   68 -----------------------
 2 files changed, 6 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-23 09:54:51 UTC (rev 373389)
+++ PKGBUILD	2018-08-23 10:40:36 UTC (rev 373390)
@@ -7,7 +7,7 @@
 # Contributor: Caleb Maclennan <caleb at alerque.com>
 
 pkgname=gitlab
-pkgver=11.2.0
+pkgver=11.2.1
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
@@ -33,10 +33,9 @@
         gitlab-backup.timer
         gitlab.target
         gitlab.tmpfiles.d
-        gitlab.logrotate
-        b41b2de702c26bfbbe375c70c48293a75546df42.patch)
+        gitlab.logrotate)
 install='gitlab.install'
-sha512sums=('787fdfae7828ddd3d4259230f0a5dd1b75f8c0081654442d0b57e7da7306627fb81610b7da6236cbe9e4335b3f5d209e217f94b28f6f2c99a0fce8ed6e721dd4'
+sha512sums=('2bef8d83e4b7a3ee0b0be6dc6e04fadcffe5e2aaa55b25ea1e2a034604e7e18685a8f52ccd965adb2adfe6808a92207798815e4a63094e618ef9bff25749918d'
             'b1bc7c1f3d47758e4745ae3689e61989c6d1fd8490fa60d75de60d3960025f2888da5c50c4a70e1656d75e4d53bcece518e87f743855eed150a61cb11d40b7d2'
             'ea5ae64214a82b522a09c20be2967ae2ff6fbfd7683587909b748dab4647f99b3128c0e16aba375ecb191e47e1b9045587a84322e216e5cda940904c4fa6271c'
             '69e6f43008389fb54bba6cea61adb0dbf5b75c5796f5cca327326f20f329365c003847bbd6d53b113a0afb1a0d3a0b101a92476739daf85f65c670a1d4466f9c'
@@ -59,8 +58,6 @@
 
   cd "${_srcdir}"*
 
-  # patch -Np1 -i "${srcdir}"/b41b2de702c26bfbbe375c70c48293a75546df42.patch
-
   # GitLab tries to read its revision information from a file.
   echo "${revision}" > REVISION
 
@@ -160,6 +157,9 @@
   rm -rf "${pkgdir}${_datadir}/tmp" && ln -fs /var/tmp "${pkgdir}${_datadir}/tmp"
   rm -rf "${pkgdir}${_datadir}/log" && ln -fs "${_logdir}" "${pkgdir}${_datadir}/log"
 
+  # Fixes https://bugs.archlinux.org/task/59762
+  ln -s "${_datadir}/config/boot.rb" "${pkgdir}"/${_etcdir}/boot.rb
+
   mv "${pkgdir}${_datadir}/.gitlab_workhorse_secret" "${pkgdir}${_etcdir}/gitlab_workhorse_secret"
   chmod 660 "${pkgdir}${_etcdir}/gitlab_workhorse_secret"
   chown root:105 "${pkgdir}${_etcdir}/gitlab_workhorse_secret"

Deleted: b41b2de702c26bfbbe375c70c48293a75546df42.patch
===================================================================
--- b41b2de702c26bfbbe375c70c48293a75546df42.patch	2018-08-23 09:54:51 UTC (rev 373389)
+++ b41b2de702c26bfbbe375c70c48293a75546df42.patch	2018-08-23 10:40:36 UTC (rev 373390)
@@ -1,68 +0,0 @@
-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