Attachment #189336 for bug #224836

Lines 4-10 Link Here

(-)b/www/gitlab/Makefile (-2 / +3 lines)
4	PORTNAME= gitlab	4	PORTNAME= gitlab
5	PORTVERSION= 10.1.5	5	PORTVERSION= 10.1.5
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= www devel	8	CATEGORIES= www devel
9		9
10	MAINTAINER= idefix@fechner.net	10	MAINTAINER= idefix@fechner.net
Lines 91-97 RUN_DEPENDS= git>=2.14.1:devel/git \ Link Here
91	rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \	91	rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \
92	rubygem-unf>=0.1.4:textproc/rubygem-unf \	92	rubygem-unf>=0.1.4:textproc/rubygem-unf \
93	rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \	93	rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \
94	rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \	94	rubygem-html-pipeline>=1.11.0:textproc/rubygem-html-pipeline \
95	rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \	95	rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
96	rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \	96	rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
97	rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \	97	rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
Lines 253-255 do-install: Link Here
253	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})	253	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
254		254
255	.include <bsd.port.mk>	255	.include <bsd.port.mk>
		256




--- Gemfile.orig	2017-12-07 12:02:52 UTC
+++ Gemfile
@@ -1,49 +1,49 @@
 source 'https://rubygems.org'

 gem 'doorkeeper', '~> 4.2.0'
 gem 'doorkeeper-openid_connect', '~> 1.2.0'
-gem 'omniauth', '~> 1.4.2'
-gem 'omniauth-auth0', '~> 1.4.1'
+gem 'omniauth', '>= 1.4.2'
+gem 'omniauth-auth0', '>= 1.4.1'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'

+gem 'omniauth-google-oauth2', '>= 0.5.2'
 gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml', '~> 1.7.0'
-gem 'omniauth-shibboleth', '~> 1.2.0'
-gem 'omniauth-twitter', '~> 1.2.0'
+gem 'omniauth-saml', '>= 1.7.0'
+gem 'omniauth-shibboleth', '>= 1.2.0'
+gem 'omniauth-twitter', '>= 1.2.0'
 gem 'omniauth_crowd', '~> 2.2.0'

 
 # for aws storage
 gem 'unf', '~> 0.1.4'
@@ -114,33 +114,33 @@ gem 'unf', '~> 0.1.4'
 gem 'seed-fu', '~> 2.3.5'
 
 # Markdown and HTML processing
-gem 'html-pipeline', '~> 1.11.0'
-gem 'deckar01-task_list', '2.0.0'
-gem 'gitlab-markup', '~> 1.6.2'
+gem 'html-pipeline', '>= 1.11.0'
+gem 'deckar01-task_list', '>= 2.0.0'
+gem 'gitlab-markup', '>= 1.6.2'
 gem 'redcarpet', '~> 3.4'

 
 # Flowdock integration
 gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration

 gem 'babosa', '~> 1.0.2'
 
 # Sanitizes SVG input
-gem 'loofah', '~> 2.0.3'
+gem 'loofah', '>= 2.0.3'
 
 # Working with license
-gem 'licensee', '~> 8.7.0'
+gem 'licensee', '>= 8.7.0'
 
 # Protect against bruteforcing
-gem 'rack-attack', '~> 4.4.1'

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_database.yml.postgresql (-1 / +1 lines)
1	--- config/database.yml.postgresql.orig 2017-11-14 20:51:25 UTC	1	--- config/database.yml.postgresql.orig 2017-12-07 12:02:52 UTC
2	+++ config/database.yml.postgresql	2	+++ config/database.yml.postgresql
3	@@ -6,7 +6,7 @@ production:	3	@@ -6,7 +6,7 @@ production:
4	encoding: unicode	4	encoding: unicode

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_gitlab.yml.example (-1 / +1 lines)
1	--- config/gitlab.yml.example.orig 2017-11-14 20:51:25 UTC	1	--- config/gitlab.yml.example.orig 2017-12-07 12:02:52 UTC
2	+++ config/gitlab.yml.example	2	+++ config/gitlab.yml.example
3	@@ -519,8 +519,8 @@ production: &base	3	@@ -519,8 +519,8 @@ production: &base
4	# real path not the symlink.	4	# real path not the symlink.

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_initializers_1__settings.rb (-1 / +1 lines)
1	--- config/initializers/1_settings.rb.orig 2017-11-14 20:51:25 UTC	1	--- config/initializers/1_settings.rb.orig 2017-12-07 12:02:52 UTC
2	+++ config/initializers/1_settings.rb	2	+++ config/initializers/1_settings.rb
3	@@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix']	3	@@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix']
4	Settings.gitlab['base_url'] \|\|= Settings.__send__(:build_base_gitlab_url)	4	Settings.gitlab['base_url'] \|\|= Settings.__send__(:build_base_gitlab_url)

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_unicorn.rb.example (-1 / +1 lines)
1	--- config/unicorn.rb.example.orig 2017-06-07 20:58:14 UTC	1	--- config/unicorn.rb.example.orig 2017-12-07 12:02:52 UTC
2	+++ config/unicorn.rb.example	2	+++ config/unicorn.rb.example
3	@@ -33,12 +33,12 @@ worker_processes 3	3	@@ -33,12 +33,12 @@ worker_processes 3
4		4

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-lib_gitlab_recaptcha.rb (-1 / +1 lines)
1	--- lib/gitlab/recaptcha.rb.orig 2017-11-14 20:51:25 UTC	1	--- lib/gitlab/recaptcha.rb.orig 2017-12-07 12:02:52 UTC
2	+++ lib/gitlab/recaptcha.rb	2	+++ lib/gitlab/recaptcha.rb
3	@@ -5,8 +5,8 @@ module Gitlab	3	@@ -5,8 +5,8 @@ module Gitlab
4	def self.load_configurations!	4	def self.load_configurations!

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-lib_support_nginx_gitlab (-1 / +1 lines)
1	--- lib/support/nginx/gitlab.orig 2017-11-14 20:51:25 UTC	1	--- lib/support/nginx/gitlab.orig 2017-12-07 12:02:52 UTC
2	+++ lib/support/nginx/gitlab	2	+++ lib/support/nginx/gitlab
3	@@ -17,7 +17,7 @@	3	@@ -17,7 +17,7 @@
4	## See installation.md#using-https for additional HTTPS configuration details.	4	## See installation.md#using-https for additional HTTPS configuration details.

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl (-1 / +1 lines)
1	--- lib/support/nginx/gitlab-ssl.orig 2017-11-14 20:51:25 UTC	1	--- lib/support/nginx/gitlab-ssl.orig 2017-12-07 12:02:52 UTC
2	+++ lib/support/nginx/gitlab-ssl	2	+++ lib/support/nginx/gitlab-ssl
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,7 @@
4	## See installation.md#using-https for additional HTTPS configuration details.	4	## See installation.md#using-https for additional HTTPS configuration details.

Return to bug 224836

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-Gemfile (-8 / +16 lines)
1	--- Gemfile.orig 2017-11-14 20:51:25 UTC	1	--- Gemfile.orig 2017-12-07 12:02:52 UTC
2	+++ Gemfile	2	+++ Gemfile
3	@@ -1,49 +1,49 @@	3	@@ -1,49 +1,49 @@
4	source 'https://rubygems.org'	4	source 'https://rubygems.org'
Lines 33-40 Link Here
33	gem 'doorkeeper', '~> 4.2.0'	33	gem 'doorkeeper', '~> 4.2.0'
34	gem 'doorkeeper-openid_connect', '~> 1.2.0'	34	gem 'doorkeeper-openid_connect', '~> 1.2.0'
35	-gem 'omniauth', '~> 1.4.2'	35	-gem 'omniauth', '~> 1.4.2'
		36	-gem 'omniauth-auth0', '~> 1.4.1'
36	+gem 'omniauth', '>= 1.4.2'	37	+gem 'omniauth', '>= 1.4.2'
37	gem 'omniauth-auth0', '~> 1.4.1'	38	+gem 'omniauth-auth0', '>= 1.4.1'
38	gem 'omniauth-azure-oauth2', '~> 0.0.9'	39	gem 'omniauth-azure-oauth2', '~> 0.0.9'
39	gem 'omniauth-cas3', '~> 1.1.4'	40	gem 'omniauth-cas3', '~> 1.1.4'
40	gem 'omniauth-facebook', '~> 4.0.0'	41	gem 'omniauth-facebook', '~> 4.0.0'
Lines 44-52 Link Here
44	+gem 'omniauth-google-oauth2', '>= 0.5.2'	45	+gem 'omniauth-google-oauth2', '>= 0.5.2'
45	gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos	46	gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
46	gem 'omniauth-oauth2-generic', '~> 0.2.2'	47	gem 'omniauth-oauth2-generic', '~> 0.2.2'
47	gem 'omniauth-saml', '~> 1.7.0'	48	-gem 'omniauth-saml', '~> 1.7.0'
48	-gem 'omniauth-shibboleth', '~> 1.2.0'	49	-gem 'omniauth-shibboleth', '~> 1.2.0'
49	-gem 'omniauth-twitter', '~> 1.2.0'	50	-gem 'omniauth-twitter', '~> 1.2.0'
		51	+gem 'omniauth-saml', '>= 1.7.0'
50	+gem 'omniauth-shibboleth', '>= 1.2.0'	52	+gem 'omniauth-shibboleth', '>= 1.2.0'
51	+gem 'omniauth-twitter', '>= 1.2.0'	53	+gem 'omniauth-twitter', '>= 1.2.0'
52	gem 'omniauth_crowd', '~> 2.2.0'	54	gem 'omniauth_crowd', '~> 2.2.0'
Lines 100-111 Link Here
100		102
101	# for aws storage	103	# for aws storage
102	gem 'unf', '~> 0.1.4'	104	gem 'unf', '~> 0.1.4'
103	@@ -115,32 +115,32 @@ gem 'seed-fu', '~> 2.3.5'	105	@@ -114,33 +114,33 @@ gem 'unf', '~> 0.1.4'
		106	gem 'seed-fu', '~> 2.3.5'
104		107
105	# Markdown and HTML processing	108	# Markdown and HTML processing
106	gem 'html-pipeline', '~> 1.11.0'	109	-gem 'html-pipeline', '~> 1.11.0'
107	-gem 'deckar01-task_list', '2.0.0'	110	-gem 'deckar01-task_list', '2.0.0'
108	-gem 'gitlab-markup', '~> 1.6.2'	111	-gem 'gitlab-markup', '~> 1.6.2'
		112	+gem 'html-pipeline', '>= 1.11.0'
109	+gem 'deckar01-task_list', '>= 2.0.0'	113	+gem 'deckar01-task_list', '>= 2.0.0'
110	+gem 'gitlab-markup', '>= 1.6.2'	114	+gem 'gitlab-markup', '>= 1.6.2'
111	gem 'redcarpet', '~> 3.4'	115	gem 'redcarpet', '~> 3.4'
Lines 183-189 Link Here
183		187
184	# Flowdock integration	188	# Flowdock integration
185	gem 'gitlab-flowdock-git-hook', '~> 1.0.1'	189	gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
186	@@ -199,13 +199,13 @@ gem 'asana', '~> 0.6.0'	190	@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0'
187	gem 'ruby-fogbugz', '~> 0.2.1'	191	gem 'ruby-fogbugz', '~> 0.2.1'
188		192
189	# Kubernetes integration	193	# Kubernetes integration
Lines 199-206 Link Here
199	gem 'babosa', '~> 1.0.2'	203	gem 'babosa', '~> 1.0.2'
200		204
201	# Sanitizes SVG input	205	# Sanitizes SVG input
202	@@ -215,7 +215,7 @@ gem 'loofah', '~> 2.0.3'	206	-gem 'loofah', '~> 2.0.3'
203	gem 'licensee', '~> 8.7.0'	207	+gem 'loofah', '>= 2.0.3'
		208
		209	# Working with license
		210	-gem 'licensee', '~> 8.7.0'
		211	+gem 'licensee', '>= 8.7.0'
204		212
205	# Protect against bruteforcing	213	# Protect against bruteforcing
206	-gem 'rack-attack', '~> 4.4.1'	214	-gem 'rack-attack', '~> 4.4.1'