Attachment 189440 Details for Bug 224932 – Fix problem with some rubygem dependencies

[patch] Fix problem with some rubygem dependencies

www_gitlab_fix_gem_updates.patch (text/plain), 6.03 KB, created by Matthias Fechner on 2018-01-05 12:53:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Fechner

Created: 2018-01-05 12:53:25 UTC

Size: 6.03 KB

patch

obsolete

>diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
>index 1bb813ffa5f..57dae529aed 100644
>--- a/www/gitlab/Makefile
>+++ b/www/gitlab/Makefile
>@@ -185,7 +185,7 @@ RUN_DEPENDS=	git>=2.14.1:devel/git \
> 	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
> 	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
> 	rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \
>-	rubygem-rbnacl>=4.0:security/rubygem-rbnacl \
>+	rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \
> 	rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
> 	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
> 	rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \
>@@ -253,3 +253,4 @@ do-install:
> 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
> 
> .include <bsd.port.mk>
>+
>diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
>index c5f4c8aa87d..356ca0db5ee 100644
>--- a/www/gitlab/files/patch-Gemfile
>+++ b/www/gitlab/files/patch-Gemfile
>@@ -163,7 +163,7 @@
>  
>  # GitLab settings
>  gem 'settingslogic', '~> 2.0.9'
>-@@ -168,7 +168,7 @@ gem 're2', '~> 1.1.1'
>+@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1'
>  
>  # Misc
>  
>@@ -172,7 +172,10 @@
>  
>  # Cache
>  gem 'redis-rails', '~> 5.0.1'
>-@@ -178,10 +178,10 @@ gem 'redis', '~> 3.2'
>+ 
>+ # Redis
>+-gem 'redis', '~> 3.2'
>++gem 'redis', '>= 3.2'
>  gem 'connection_pool', '~> 2.0'
>  
>  # HipChat integration
>@@ -214,7 +217,7 @@
>  
>  # Ace editor
>  gem 'ace-rails-ap', '~> 4.1.0'
>-@@ -234,25 +234,25 @@ gem 'chronic', '~> 0.10.2'
>+@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2'
>  gem 'chronic_duration', '~> 0.10.6'
>  
>  gem 'webpack-rails', '~> 0.9.10'
>@@ -245,9 +248,10 @@
> -gem 'sentry-raven', '~> 2.5.3'
> +gem 'sentry-raven', '>= 2.5.3'
>  
>- gem 'premailer-rails', '~> 1.9.7'
>+-gem 'premailer-rails', '~> 1.9.7'
>++gem 'premailer-rails', '>= 1.9.7'
>  
>-@@ -260,135 +260,51 @@ gem 'premailer-rails', '~> 1.9.7'
>+ # I18n
>  gem 'ruby_parser', '~> 3.8', require: false
>  gem 'rails-i18n', '~> 4.0.9'
>  gem 'gettext_i18n_rails', '~> 1.8.0'
>@@ -369,7 +373,8 @@
> +gem 'email_reply_trimmer', '>= 0.1'
>  gem 'html2text'
>  
>- gem 'ruby-prof', '~> 0.16.2'
>+-gem 'ruby-prof', '~> 0.16.2'
>++gem 'ruby-prof', '>= 0.16.2'
>  
>  # OAuth
> -gem 'oauth2', '~> 1.4'
>@@ -393,7 +398,10 @@
>  
>  # Required for ED25519 SSH host key support
>  group :ed25519 do
>-@@ -398,9 +314,9 @@ group :ed25519 do
>+   gem 'rbnacl-libsodium'
>+-  gem 'rbnacl', '~> 4.0'
>++  gem 'rbnacl', '~> 4.0.2'
>+   gem 'bcrypt_pbkdf', '~> 1.0'
>  end
>  
>  # Gitaly GRPC client
>diff --git a/www/gitlab/files/patch-config_database.yml.postgresql b/www/gitlab/files/patch-config_database.yml.postgresql
>index 352b21431b4..eacc94225a2 100644
>--- a/www/gitlab/files/patch-config_database.yml.postgresql
>+++ b/www/gitlab/files/patch-config_database.yml.postgresql
>@@ -1,4 +1,4 @@
>---- config/database.yml.postgresql.orig	2017-11-14 20:51:25 UTC
>+--- config/database.yml.postgresql.orig	2017-12-07 12:02:52 UTC
> +++ config/database.yml.postgresql
> @@ -6,7 +6,7 @@ production:
>    encoding: unicode
>diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
>index 63207b2b1f1..53f3a9b3852 100644
>--- a/www/gitlab/files/patch-config_gitlab.yml.example
>+++ b/www/gitlab/files/patch-config_gitlab.yml.example
>@@ -1,4 +1,4 @@
>---- config/gitlab.yml.example.orig	2017-11-14 20:51:25 UTC
>+--- config/gitlab.yml.example.orig	2017-12-07 12:02:52 UTC
> +++ config/gitlab.yml.example
> @@ -519,8 +519,8 @@ production: &base
>      # real path not the symlink.
>diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb
>index 2273256c3e6..1fa396110c4 100644
>--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
>+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
>@@ -1,4 +1,4 @@
>---- config/initializers/1_settings.rb.orig	2017-11-14 20:51:25 UTC
>+--- config/initializers/1_settings.rb.orig	2017-12-07 12:02:52 UTC
> +++ config/initializers/1_settings.rb
> @@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix'] 
>  Settings.gitlab['base_url']   ||= Settings.__send__(:build_base_gitlab_url)
>diff --git a/www/gitlab/files/patch-config_unicorn.rb.example b/www/gitlab/files/patch-config_unicorn.rb.example
>index 89953fd6741..4da74f31089 100644
>--- a/www/gitlab/files/patch-config_unicorn.rb.example
>+++ b/www/gitlab/files/patch-config_unicorn.rb.example
>@@ -1,4 +1,4 @@
>---- config/unicorn.rb.example.orig	2017-06-07 20:58:14 UTC
>+--- config/unicorn.rb.example.orig	2017-12-07 12:02:52 UTC
> +++ config/unicorn.rb.example
> @@ -33,12 +33,12 @@ worker_processes 3
>  
>diff --git a/www/gitlab/files/patch-lib_gitlab_recaptcha.rb b/www/gitlab/files/patch-lib_gitlab_recaptcha.rb
>index 17f5ce29d89..5dbf31bf47b 100644
>--- a/www/gitlab/files/patch-lib_gitlab_recaptcha.rb
>+++ b/www/gitlab/files/patch-lib_gitlab_recaptcha.rb
>@@ -1,4 +1,4 @@
>---- lib/gitlab/recaptcha.rb.orig	2017-11-14 20:51:25 UTC
>+--- lib/gitlab/recaptcha.rb.orig	2017-12-07 12:02:52 UTC
> +++ lib/gitlab/recaptcha.rb
> @@ -5,8 +5,8 @@ module Gitlab
>      def self.load_configurations!
>diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab b/www/gitlab/files/patch-lib_support_nginx_gitlab
>index 4a43b212311..3ada32e494f 100644
>--- a/www/gitlab/files/patch-lib_support_nginx_gitlab
>+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab
>@@ -1,4 +1,4 @@
>---- lib/support/nginx/gitlab.orig	2017-11-14 20:51:25 UTC
>+--- lib/support/nginx/gitlab.orig	2017-12-07 12:02:52 UTC
> +++ lib/support/nginx/gitlab
> @@ -17,7 +17,7 @@
>  ## See installation.md#using-https for additional HTTPS configuration details.
>diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
>index d64345f07fb..2ef1efbaf6b 100644
>--- a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
>+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
>@@ -1,4 +1,4 @@
>---- lib/support/nginx/gitlab-ssl.orig	2017-11-14 20:51:25 UTC
>+--- lib/support/nginx/gitlab-ssl.orig	2017-12-07 12:02:52 UTC
> +++ lib/support/nginx/gitlab-ssl
> @@ -21,7 +21,7 @@
>  ## See installation.md#using-https for additional HTTPS configuration details.

Actions: View | Diff

Attachments on bug 224932: 189440