Update to 9.1.0

5 files changed, 73 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27fc75e0a768..ef66baaa42df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
+# Generated by mksrcinfo v8
+# Tue Apr 25 14:19:37 UTC 2017
 pkgbase = gitlab-ee
 	pkgdesc = Project management and code hosting application
-	pkgver = 8.17.4
+	pkgver = 9.1.0
 	pkgrel = 1
-	url = https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README
+	url = https://gitlab.com/gitlab-org/gitlab-ee/tree/master#README
 	install = gitlab.install
 	arch = i686
 	arch = x86_64
@@ -10,6 +12,7 @@ pkgbase = gitlab-ee
 	makedepends = cmake
 	makedepends = postgresql
 	makedepends = mariadb
+	makedepends = yarn
 	depends = ruby2.3
 	depends = git
 	depends = ruby2.3-bundler
@@ -30,7 +33,7 @@ pkgbase = gitlab-ee
 	backup = etc/webapps/gitlab/resque.yml
 	backup = etc/webapps/gitlab/unicorn.rb
 	backup = etc/logrotate.d/gitlab
-	source = gitlab-ee-8.17.4.tar.bz2::https://gitlab.com/gitlab-org/gitlab-ee/repository/archive.tar.bz2?ref=v8.17.4-ee
+	source = gitlab-ee-9.1.0.tar.bz2::https://gitlab.com/gitlab-org/gitlab-ee/repository/archive.tar.bz2?ref=v9.1.0-ee
 	source = gitlab-unicorn.service
 	source = gitlab-sidekiq.service
 	source = gitlab-backup.service
@@ -46,7 +49,9 @@ pkgbase = gitlab-ee
 	source = nginx.conf.example
 	source = nginx-ssl.conf.example
 	source = lighttpd.conf.example
-	sha512sums = cfd068187b3676a3d590d8dc304acae6e8672fca889b070dd5915e417a36ad7db0a1e41e13c9b9f7c29a1853c9c0c5d1408749c952ccd46e034db62c444a8f56
+	source = 10589.patch
+	source = shell-link.patch
+	sha512sums = 7c56752f9d5252c5ca0b180ec0591f83910045d888b81654c4664b2be742be5f13cf98ad6405739e00afcbc87c5909db0d776eeead199dc52f7def7388540e04
 	sha512sums = 56cce150645ef74fa42a6100c8bc7689c4012579e1f3ba237c06c367b121246b39e968044615fa21c4757bc8e9d06f37f8ac8d39aa8b808c758e716857553f66
 	sha512sums = 52651e4a5dd2d632e31b7275283f9b8ab2c32c4d56b63d17bd843f300e273e382e339e5aed66222b1b2279273357cbb73aa38119f04784fe380d1550346f1ff3
 	sha512sums = 79cfb8ee740ab30f970c3113659b8349128abeae5e32cc81bb905f89a6db9941b7778040a094b884262daf020f66a1aee49a12d34fbb94efce6ade946bb4625b
@@ -62,6 +67,8 @@ pkgbase = gitlab-ee
 	sha512sums = 53a9d6d6f87874b29e48a8fb2e207094ebc1a80af478562ec4b591926d59e135a3166c20966704aa948ca7063ba63c1ec4ac290a343832fa18025ec3d85081ba
 	sha512sums = 6d3006da591acefcc534c6e3f1da8e812d0b3b21fc416bfaa8678b8e2d922be6b17d1c92b0d7164de3b8ad864139253707107ca082f78e823d23f3b65fcb5914
 	sha512sums = c78b6f46abcf603d8db6e38cf50868e14145928422ddfe17c88e2f006b5b910dddf456ec5d6d724b250994530643963809688a98f7e12ebd5b5dabf7f96f0e06
+	sha512sums = 364408ad2cc7fd866c1f78a336fead0876c6af694cc45744a7dda680d40ad12bc2c35f18b54f4043af3f144a43a64ced5155e61210a88f814918152f041e1bb6
+	sha512sums = 845338cb633fd57caccddce7c7bdea37568a66ef777f721639a53dbac56e10c4cbe77314d9875ade9eb43f3935ea894fcd3625f1580cda56b59809f76ab9d12f
 
 pkgname = gitlab-ee
 	depends = ruby2.3
diff --git a/.gitignore b/.gitignore
index 26ac48df7db9..b73f45316f95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 pkg/
 src/
 *.pkg.tar*
+*.bz2
+*.tar
+*.gz
diff --git a/10589.patch b/10589.patch
new file mode 100644
index 000000000000..435b24929e86
--- /dev/null
+++ b/10589.patch
@@ -0,0 +1,28 @@
+From e46f67a5123433f132da28770e4027542062fc81 Mon Sep 17 00:00:00 2001
+From: Jacob Vosmaer <jacob@gitlab.com>
+Date: Mon, 10 Apr 2017 13:24:14 +0200
+Subject: [PATCH] Use gRPC 1.2.2
+
+Fixes LoadError after local compilation.
+
+https://github.com/grpc/grpc/issues/9998
+---
+ Gemfile.lock | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Gemfile.lock b/Gemfile.lock
+index d7e3f73..965c888 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -330,7 +330,7 @@ GEM
+     grape-entity (0.6.0)
+       activesupport
+       multi_json (>= 1.3.2)
+-    grpc (1.1.2)
++    grpc (1.2.2)
+       google-protobuf (~> 3.1)
+       googleauth (~> 0.5.1)
+     haml (4.0.7)
+-- 
+2.10.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 2073cc08b0db..c0311b699bf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: Janne Heß <jannehess@gmail.com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Pavol (Lopo) Hluchy <lopo AT losys DOT eu>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
@@ -8,16 +9,16 @@
 
 _pkgname=gitlab
 pkgname=${_pkgname}-ee
-pkgver=8.17.4
+pkgver=9.1.0
 pkgrel=1
 pkgdesc="Project management and code hosting application"
 arch=('i686' 'x86_64')
-url="https://gitlab.com/gitlab-org/gitlab-ce/tree/master#README"
+url="https://gitlab.com/gitlab-org/gitlab-ee/tree/master#README"
 license=('MIT')
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
 depends=('ruby2.3' 'git' 'ruby2.3-bundler' 'gitlab-workhorse' 'openssh' 'redis' 'libxslt' 'icu' 'nodejs')
-makedepends=('cmake' 'postgresql' 'mariadb')
+makedepends=('cmake' 'postgresql' 'mariadb' 'yarn')
 optdepends=('postgresql: database backend'
             'mysql: database backend'
             'python2-docutils: reStructuredText markup language support'
@@ -42,9 +43,11 @@ source=("${pkgname}-${pkgver}.tar.bz2::https://gitlab.com/gitlab-org/gitlab-ee/r
         apache2.2-ssl.conf.example
         nginx.conf.example
         nginx-ssl.conf.example
-        lighttpd.conf.example)
+        lighttpd.conf.example
+        10589.patch
+        shell-link.patch)
 install='gitlab.install'
-sha512sums=('cfd068187b3676a3d590d8dc304acae6e8672fca889b070dd5915e417a36ad7db0a1e41e13c9b9f7c29a1853c9c0c5d1408749c952ccd46e034db62c444a8f56'
+sha512sums=('7c56752f9d5252c5ca0b180ec0591f83910045d888b81654c4664b2be742be5f13cf98ad6405739e00afcbc87c5909db0d776eeead199dc52f7def7388540e04'
             '56cce150645ef74fa42a6100c8bc7689c4012579e1f3ba237c06c367b121246b39e968044615fa21c4757bc8e9d06f37f8ac8d39aa8b808c758e716857553f66'
             '52651e4a5dd2d632e31b7275283f9b8ab2c32c4d56b63d17bd843f300e273e382e339e5aed66222b1b2279273357cbb73aa38119f04784fe380d1550346f1ff3'
             '79cfb8ee740ab30f970c3113659b8349128abeae5e32cc81bb905f89a6db9941b7778040a094b884262daf020f66a1aee49a12d34fbb94efce6ade946bb4625b'
@@ -59,7 +62,9 @@ sha512sums=('cfd068187b3676a3d590d8dc304acae6e8672fca889b070dd5915e417a36ad7db0a
             '248d47b44fa5ed65e2a940f2b60d0482c481b3a438357ca510848221370367ffbc0d83ce046d688bebbbc75d4e321b140f6a5ce1a9d7ec0b034fafcf92dee107'
             '53a9d6d6f87874b29e48a8fb2e207094ebc1a80af478562ec4b591926d59e135a3166c20966704aa948ca7063ba63c1ec4ac290a343832fa18025ec3d85081ba'
             '6d3006da591acefcc534c6e3f1da8e812d0b3b21fc416bfaa8678b8e2d922be6b17d1c92b0d7164de3b8ad864139253707107ca082f78e823d23f3b65fcb5914'
-            'c78b6f46abcf603d8db6e38cf50868e14145928422ddfe17c88e2f006b5b910dddf456ec5d6d724b250994530643963809688a98f7e12ebd5b5dabf7f96f0e06')
+            'c78b6f46abcf603d8db6e38cf50868e14145928422ddfe17c88e2f006b5b910dddf456ec5d6d724b250994530643963809688a98f7e12ebd5b5dabf7f96f0e06'
+            '364408ad2cc7fd866c1f78a336fead0876c6af694cc45744a7dda680d40ad12bc2c35f18b54f4043af3f144a43a64ced5155e61210a88f814918152f041e1bb6'
+            '845338cb633fd57caccddce7c7bdea37568a66ef777f721639a53dbac56e10c4cbe77314d9875ade9eb43f3935ea894fcd3625f1580cda56b59809f76ab9d12f')
 
 _datadir="/usr/share/webapps/${_pkgname}"
 _etcdir="/etc/webapps/${_pkgname}"
@@ -70,6 +75,12 @@ _srcdir="${pkgname}-v${pkgver}-ee-"
 prepare() {
   cd "${srcdir}/${_srcdir}"*
 
+  # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10589
+  # https://gitlab.com/gitlab-org/gitlab-ce/issues/29562
+  # https://gitlab.com/gitlab-org/gitlab-ce/issues/30124
+  patch -Np1 < "${srcdir}"/10589.patch
+  patch -Np0 < "${srcdir}"/shell-link.patch
+
   export SKIP_STORAGE_VALIDATION='true'
 
   # Patching config files:
@@ -111,9 +122,8 @@ prepare() {
 
 build() {
   cd "${srcdir}/${_srcdir}"*
-  
-  export SKIP_STORAGE_VALIDATION='true'
 
+  export SKIP_STORAGE_VALIDATION='true'
   msg "Fetching bundled gems..."
   # Gems will be installed into vendor/bundle
 
@@ -125,7 +135,8 @@ build() {
   cp config/resque.yml.example config/resque.yml
   sed -i 's/url.*/nope.sock/g' config/resque.yml
 
-  bundle-2.3 exec rake assets:precompile RAILS_ENV=production --trace
+  yarn install --production --pure-lockfile
+  bundle-2.3 exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
 
   # After building assets, clean this up again
   rm config/database.yml config/database.yml.postgresql.orig
@@ -172,7 +183,6 @@ package() {
   # Fix for ruby-2.3 and bundle-2.3
   sed -i "s|bundle|bundle-2.3|g" "${pkgdir}${_datadir}/lib/tasks/gitlab/check.rake"
   grep -rl "bin/env ruby" "${pkgdir}${_datadir}" | xargs sed -i "s|bin/env ruby$|bin/env ruby-2.3|g"
-  grep -rl "bin/env rake" "${pkgdir}${_datadir}" | xargs sed -i "s|bin/env rake$|bin/env rake-2.3|g"
 
   # Install config files
   for config_file in application.rb gitlab.yml unicorn.rb resque.yml; do
diff --git a/shell-link.patch b/shell-link.patch
new file mode 100644
index 000000000000..60dc8b62057a
--- /dev/null
+++ b/shell-link.patch
@@ -0,0 +1,10 @@
+--- lib/gitlab/shell.rb	2017-04-25 16:10:04.588925291 +0200
++++ lib/gitlab/shell.rb	2017-04-25 16:10:08.628924919 +0200
+@@ -53,7 +53,6 @@
+ 
+         link_path = File.join(shell_path, '.gitlab_shell_secret')
+         if File.exist?(shell_path) && !File.exist?(link_path)
+-          FileUtils.symlink(secret_file, link_path)
+         end
+       end
+     end