[DRE-commits] [gitlab] 03/09: refresh patches

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Sat Apr 2 16:23:35 UTC 2016 

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master-8.5
in repository gitlab.

commit 5e81b74803432090d45028b0bff35ecee507da8f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Apr 2 18:29:19 2016 +0530

    refresh patches
---
 debian/patches/0002-loosen-devise.patch            |  2 +-
 debian/patches/0005-use-debian-omniauth-ldap.patch |  2 +-
 debian/patches/0015-loosen-carrierwave.patch       |  2 +-
 debian/patches/0016-loosen-fog.patch               |  2 +-
 debian/patches/0018-loosen-rdoc.patch              |  2 +-
 debian/patches/0020-loosen-unicorn.patch           |  2 +-
 debian/patches/0028-loosen-ace-rails-ap.patch      |  2 +-
 debian/patches/0037-loosen-request-store.patch     |  2 +-
 debian/patches/0038-relax-net-ssh.patch            | 12 +++++++-----
 debian/patches/0039-relax-nokogiri.patch           | 15 ---------------
 debian/patches/0040-relax-rails.patch              |  4 ++--
 debian/patches/0041-relax-omniauth.patch           |  4 ++--
 debian/patches/0042-relax-grape-entity.patch       |  2 +-
 debian/patches/0050-relax-stable-libs.patch        |  6 +++---
 debian/patches/0100-remove-development-test.patch  | 14 +++++---------
 debian/patches/0102-loosen-octokit.patch           |  8 ++++----
 debian/patches/series                              |  1 -
 debian/patches/source-init-functions.patch         |  2 +-
 18 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/debian/patches/0002-loosen-devise.patch b/debian/patches/0002-loosen-devise.patch
index c60fbd0..0270ae2 100644
--- a/debian/patches/0002-loosen-devise.patch
+++ b/debian/patches/0002-loosen-devise.patch
@@ -12,4 +12,4 @@ Index: gitlab/Gemfile
 +gem 'devise',                 '~> 3.5.2'
  gem 'devise-async',           '~> 0.9.0'
  gem 'doorkeeper',             '~> 2.2.0'
- gem 'omniauth',               '~> 1.2.2'
+ gem 'omniauth',               '~> 1.3.1'
diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index 92d4bb8..0e2b67f 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -5,7 +5,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -54,7 +54,7 @@ gem "gitlab_git", '~> 7.2.22'
+@@ -55,7 +55,7 @@ gem "gitlab_git", '~> 8.2'
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
diff --git a/debian/patches/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
index 9065cd1..1f370e9 100644
--- a/debian/patches/0015-loosen-carrierwave.patch
+++ b/debian/patches/0015-loosen-carrierwave.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -74,7 +74,7 @@ gem "kaminari", "~> 0.16.3"
+@@ -75,7 +75,7 @@ gem "kaminari", "~> 0.16.3"
  gem "haml-rails", '~> 0.9.0'
  
  # Files attachments
diff --git a/debian/patches/0016-loosen-fog.patch b/debian/patches/0016-loosen-fog.patch
index ce17015..656320a 100644
--- a/debian/patches/0016-loosen-fog.patch
+++ b/debian/patches/0016-loosen-fog.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -80,7 +80,7 @@ gem "carrierwave", '~> 0.10.0'
+@@ -81,7 +81,7 @@ gem "carrierwave", '~> 0.10.0'
  gem 'dropzonejs-rails', '~> 0.7.1'
  
  # for aws storage
diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index 8a5b9db..b106d4d 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -95,7 +95,7 @@ gem 'task_list',     '~> 1.0.2', require
+@@ -96,7 +96,7 @@ gem 'task_list',     '~> 1.0.2', require
  gem 'github-markup', '~> 1.3.1'
  gem 'redcarpet',     '~> 3.3.3'
  gem 'RedCloth',      '~> 4.2.9'
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index dbf531e..9afafea 100644
--- a/debian/patches/0020-loosen-unicorn.patch
+++ b/debian/patches/0020-loosen-unicorn.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -111,7 +111,7 @@ gem 'diffy', '~> 3.0.3'
+@@ -112,7 +112,7 @@ gem 'diffy', '~> 3.0.3'
  
  # Application server
  group :unicorn do
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
index 4a759f6..e20d7dd 100644
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ b/debian/patches/0028-loosen-ace-rails-ap.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -183,7 +183,7 @@ gem 'babosa', '~> 1.0.2'
+@@ -187,7 +187,7 @@ gem "loofah", "~> 2.0.3"
  gem "rack-attack", '~> 4.3.1'
  
  # Ace editor
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index 856fe89..63a2d10 100644
--- a/debian/patches/0037-loosen-request-store.patch
+++ b/debian/patches/0037-loosen-request-store.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -208,7 +208,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -212,7 +212,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
  gem 'jquery-ui-rails',    '~> 5.0.0'
  gem 'nprogress-rails',    '~> 0.1.6.7'
  gem 'raphael-rails',      '~> 2.1.2'
diff --git a/debian/patches/0038-relax-net-ssh.patch b/debian/patches/0038-relax-net-ssh.patch
index 177bc0e..5a03a11 100644
--- a/debian/patches/0038-relax-net-ssh.patch
+++ b/debian/patches/0038-relax-net-ssh.patch
@@ -2,14 +2,16 @@ Description: Relax requirement on net-ssh
 Author: Pirate Praveen <praveen at debian.org>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Gemfile
-+++ b/Gemfile
-@@ -211,7 +211,7 @@
+Index: gitlab/Gemfile
+===================================================================
+--- gitlab.orig/Gemfile
++++ gitlab/Gemfile
+@@ -215,7 +215,7 @@ gem 'raphael-rails',      '~> 2.1.2'
  gem 'request_store',      '~> 1.1'
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
 -gem 'net-ssh',            '~> 3.0.1'
 +gem 'net-ssh',            '>= 2.9.2'
  
- # Metrics
- group :metrics do
+ # Sentry integration
+ gem 'sentry-raven', '~> 0.15'
diff --git a/debian/patches/0039-relax-nokogiri.patch b/debian/patches/0039-relax-nokogiri.patch
deleted file mode 100644
index 9670e18..0000000
--- a/debian/patches/0039-relax-nokogiri.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/13218
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -104,7 +104,7 @@ gem 'rouge',         '~> 1.10.1'
- 
- # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
- # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
--gem 'nokogiri', '1.6.7.2'
-+gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.1'
- 
- # Diffs
- gem 'diffy', '~> 3.0.3'
diff --git a/debian/patches/0040-relax-rails.patch b/debian/patches/0040-relax-rails.patch
index 736c443..597cbb2 100644
--- a/debian/patches/0040-relax-rails.patch
+++ b/debian/patches/0040-relax-rails.patch
@@ -5,8 +5,8 @@ Index: gitlab/Gemfile
 @@ -1,6 +1,6 @@
  source "https://rubygems.org"
  
--gem 'rails', '4.2.5.1'
-+gem 'rails', '~> 4.2.5', '>= 4.2.5.1'
+-gem 'rails', '4.2.5.2'
++gem 'rails', '~> 4.2.5', '>= 4.2.5.2'
  gem 'rails-deprecated_sanitizer', '~> 1.0.3'
  
  # Responders respond_to and respond_with
diff --git a/debian/patches/0041-relax-omniauth.patch b/debian/patches/0041-relax-omniauth.patch
index 16ce973..0717522 100644
--- a/debian/patches/0041-relax-omniauth.patch
+++ b/debian/patches/0041-relax-omniauth.patch
@@ -6,8 +6,8 @@ Index: gitlab/Gemfile
  gem 'devise',                 '~> 3.5.2'
  gem 'devise-async',           '~> 0.9.0'
  gem 'doorkeeper',             '~> 2.2.0'
--gem 'omniauth',               '~> 1.2.2'
-+gem 'omniauth',               '~> 1.2', '>= 1.2.2'
+-gem 'omniauth',               '~> 1.3.1'
++gem 'omniauth',               '~> 1.3', '>= 1.3.1'
  gem 'omniauth-azure-oauth2',  '~> 0.0.6'
  gem 'omniauth-bitbucket',     '~> 0.0.2'
  gem 'omniauth-cas3',          '~> 1.1.2'
diff --git a/debian/patches/0042-relax-grape-entity.patch b/debian/patches/0042-relax-grape-entity.patch
index cc64861..7537118 100644
--- a/debian/patches/0042-relax-grape-entity.patch
+++ b/debian/patches/0042-relax-grape-entity.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -64,7 +64,7 @@ gem "github-linguist", "~> 4.7.0", requi
+@@ -65,7 +65,7 @@ gem "github-linguist", "~> 4.7.0", requi
  
  # API
  gem 'grape',        '~> 0.13.0'
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index dab10c9..07ff22d 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -6,12 +6,12 @@ Index: gitlab/Gemfile
  gem 'omniauth-gitlab',        '~> 1.0.0'
  gem 'omniauth-google-oauth2', '~> 0.2.0'
  gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
--gem 'omniauth-saml',          '~> 1.4.0'
-+gem 'omniauth-saml',          '~> 1.4'
+-gem 'omniauth-saml',          '~> 1.4.2'
++gem 'omniauth-saml',          '~> 1.4', '>= 1.4.2'
  gem 'omniauth-shibboleth',    '~> 1.2.0'
  gem 'omniauth-twitter',       '~> 1.2.0'
  gem 'omniauth_crowd',         '~> 2.2.0'
-@@ -92,7 +92,7 @@ gem "seed-fu", '~> 2.3.5'
+@@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 1.11.0'
  gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index b3586df..f74ef75 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -221,87 +221,11 @@ group :metrics do
+@@ -228,83 +228,6 @@ group :metrics do
    gem 'connection_pool', '~> 2.0', require: false
  end
  
@@ -79,16 +79,12 @@ Index: gitlab/Gemfile
 -  gem 'sham_rack'
 -end
 -
- group :production do
+-group :production do
 -  gem "gitlab_meta", '7.0'
+-end
 -
-   # Sentry integration
-   gem 'sentry-raven'
- end
- 
--gem "newrelic_rpm", '~> 3.9.4.245'
--gem 'newrelic-grape'
+-gem "newrelic_rpm", '~> 3.14'
 -
- gem 'octokit', '~> 3.7.0'
+ gem 'octokit', '~> 3.8.0'
  
  gem "mail_room", "~> 0.6.1"
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index 87627b0..362e8aa 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -4,12 +4,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -226,7 +226,7 @@ group :production do
-   gem 'sentry-raven'
+@@ -228,7 +228,7 @@ group :metrics do
+   gem 'connection_pool', '~> 2.0', require: false
  end
  
--gem 'octokit', '~> 3.7.0'
-+gem 'octokit', '~> 3.7'
+-gem 'octokit', '~> 3.8.0'
++gem 'octokit', '~> 3.8'
  
  gem "mail_room", "~> 0.6.1"
  
diff --git a/debian/patches/series b/debian/patches/series
index 60808b5..8a527eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@
 0028-loosen-ace-rails-ap.patch
 0037-loosen-request-store.patch
 0038-relax-net-ssh.patch
-0039-relax-nokogiri.patch
 0040-relax-rails.patch
 0041-relax-omniauth.patch
 0042-relax-grape-entity.patch
diff --git a/debian/patches/source-init-functions.patch b/debian/patches/source-init-functions.patch
index df981fd..6aec633 100644
--- a/debian/patches/source-init-functions.patch
+++ b/debian/patches/source-init-functions.patch
@@ -19,7 +19,7 @@ Index: gitlab/lib/support/init.d/gitlab
  sidekiq_pid_path="$pid_path/sidekiq.pid"
  mail_room_enabled=false
  mail_room_pid_path="$pid_path/mail_room.pid"
--gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
+-gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd)
 +gitlab_workhorse_dir=$app_root/../gitlab-workhorse
  gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
  gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $rails_socket -documentRoot $app_root/public"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git

More information about the Pkg-ruby-extras-commits mailing list