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

2018-08-23 Thread Sven-Hendrik Haase via arch-commits 
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
===
--- PKGBUILD2018-08-23 09:54:51 UTC (rev 373389)
+++ PKGBUILD2018-08-23 10:40:36 UTC (rev 373390)
@@ -7,7 +7,7 @@
 # Contributor: Caleb Maclennan 
 
 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 
-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@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@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

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

2018-05-11 Thread Sven-Hendrik Haase via arch-commits 
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
===
--- PKGBUILD2018-05-11 23:16:47 UTC (rev 320914)
+++ PKGBUILD2018-05-12 00:51:46 UTC (rev 320915)
@@ -7,7 +7,7 @@
 # Contributor: Caleb Maclennan 
 
 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 
+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

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

2018-04-01 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, April 1, 2018 @ 19:30:34
  Author: svenstaro
Revision: 313753

upgpkg: gitlab 10.6.2-2

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

+
 PKGBUILD   |   10 +---
 a951b96be2862ce660dc715a364f574c2f5f72e1.patch |   28 +++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-01 19:19:53 UTC (rev 313752)
+++ PKGBUILD2018-04-01 19:30:34 UTC (rev 313753)
@@ -8,7 +8,7 @@
 
 pkgname=gitlab
 pkgver=10.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Project management and code hosting application"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitlab-ce;
@@ -34,7 +34,8 @@
 gitlab.target
 gitlab.tmpfiles.d
 gitlab.logrotate
-yarn.lock)
+yarn.lock
+a951b96be2862ce660dc715a364f574c2f5f72e1.patch)
 install='gitlab.install'
 
sha512sums=('c361605186a2a0cccec7167d47be458f06a0627864d58bdd77f2ebf0edf0faebedc29a908dd7116733b74be4c94825f2317ed2057d28ecd246907f4be9dc8794'
 
'c3ef56956fd0d8af1710d0c992f936c79477de35d65107eb5fde2611c65f1bf4e36a954c089a7588bac92c774e38af4581501b861decdb2193a5c08eeac92d32'
@@ -45,7 +46,8 @@
 
'bf33b818e4ea671c16f58563997ba5fe0a09090e5c03577ff974d31324d4e9782b85a9bb4f1749b97257ce93400c692de935f003770d52b5994c9cab9aee57c6'
 
'abacbff0d7be918337a17b56481c84e6bf3eddd9551efe78ba9fb74337179e95c9b60f41c49f275e05074a4074a616be36fa208a48fc12d5b940f0554fbd89c3'
 
'20b93eab504e82cc4401685b59e6311b4d2c0285bc594d47ce4106d3f418a3e2ba92c4f49732748c0ba913aa3e3299126166e37d2a2d5b4d327d66bae4b8abda'
-
'ef4a91d2e5db3aabf83092d9fdff5cd830d291b78d05b4fc9ea991fc5f3299c1a70bbde2632935f899dbf0be084348d125e62df0e87d7925e2ea8068b3463d4d')
+
'ef4a91d2e5db3aabf83092d9fdff5cd830d291b78d05b4fc9ea991fc5f3299c1a70bbde2632935f899dbf0be084348d125e62df0e87d7925e2ea8068b3463d4d'
+
'd7946c9c336e8d148479c1034e0058f2c6f8810e66a5369d531de3050ae7c0ff53be8789bc592afddba16a2acb660670fb687badc7eb65b7db5a445151140cb7')
 
 _datadir="/usr/share/webapps/${pkgname}"
 _etcdir="/etc/webapps/${pkgname}"
@@ -62,6 +64,8 @@
 
   cd "${_srcdir}"*
 
+  patch -Np1 -i "${srcdir}"/a951b96be2862ce660dc715a364f574c2f5f72e1.patch
+
   # Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/36397
   # We used to need this but now the package doesn't build anymore with this. 
Leaving it commented for now.
   # See also https://gitlab.com/gitlab-org/gitlab-ce/issues/38525

Added: a951b96be2862ce660dc715a364f574c2f5f72e1.patch
===
--- a951b96be2862ce660dc715a364f574c2f5f72e1.patch  
(rev 0)
+++ a951b96be2862ce660dc715a364f574c2f5f72e1.patch  2018-04-01 19:30:34 UTC 
(rev 313753)
@@ -0,0 +1,28 @@
+From a951b96be2862ce660dc715a364f574c2f5f72e1 Mon Sep 17 00:00:00 2001
+From: Zeger-Jan van de Weg 
+Date: Fri, 30 Mar 2018 12:32:26 +0200
+Subject: [PATCH] Update charlock_holmes to 0.76
+
+Didn't compile against newer icu4c versions and was fixed upstream in
+https://github.com/brianmario/charlock_holmes/pull/129, which was
+releaed in the versions its now locked to.
+---
+ Gemfile.lock | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Gemfile.lock b/Gemfile.lock
+index fcffe45..5271d65 100644
+--- a/Gemfile.lock
 b/Gemfile.lock
+@@ -120,7 +120,7 @@ GEM
+   activesupport (>= 4.0.0)
+   mime-types (>= 1.16)
+ cause (0.1)
+-charlock_holmes (0.7.5)
++charlock_holmes (0.7.6)
+ childprocess (0.7.0)
+   ffi (~> 1.0, >= 1.0.11)
+ chronic (0.10.2)
+--
+libgit2 0.26.0
+