www/gitlab: Update from 10.1.4 to 10.1.5

Also:
- remove %%RUBY_SUFFIX%% from plist (thanks to swills)
- fix broken dependency to rubygem-pg in Gemfile
- fix broken dependency to rubygem-mysql2 in Gemfile
- Add support for reverse proxies in rc script
- Fix: gitlab starts even if gitlab_enable is not set
- Make default listenAddr configurable

PR:           224232 222896 220126 218388
Submitted by: swills, gdinolt@pacbell.net, max@mober.at, Marián Černý <majo-bugs.freebsd.org@cerny.sk>
Reviewed by:  tz
Approved by:  maintainer
Differential Revision:	https://reviews.freebsd.org/D12376

6 files changed, 75 insertions, 34 deletions

diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index fd1c70b3b96c..69b3588715b4 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab
-PORTVERSION=	10.1.4
+PORTVERSION=	10.1.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	idefix@fechner.net
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index e218476215c1..f29a1ebf38f1 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511004904
-SHA256 (gitlabhq-gitlabhq-v10.1.4_GH0.tar.gz) = e8e0fc327378be095b8878282f0ca772ad7d76b66fc62f89be779b3a547e51ef
-SIZE (gitlabhq-gitlabhq-v10.1.4_GH0.tar.gz) = 41725442
+TIMESTAMP = 1512812405
+SHA256 (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 8b8f8d88757bb7cc4f204c31f3d67fe4f4191fb25d1e4df81cf2c4361e10a725
+SIZE (gitlabhq-gitlabhq-v10.1.5_GH0.tar.gz) = 41727928
diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in
index 243cd60d5324..05f63293788e 100644
--- a/www/gitlab/files/gitlab.in
+++ b/www/gitlab/files/gitlab.in
@@ -37,8 +37,10 @@ start_cmd="start_gitlab"
 stop_cmd="stop_gitlab"
 restart_cmd="restart_gitlab"
 
-gitlab_enable=${gitlab_enable:-"NO"}
-gitlab_authBackend=${gitlab_authBackend:-"http://127.0.0.1:8080"}
+: ${gitlab_enable:="NO"}
+: ${gitlab_authBackend:="http://127.0.0.1:8080"}
+: ${gitlab_workhorse_tcp:="NO"}
+: ${gitlab_workhorse_addr:="127.0.0.1:8181"}
 
 load_rc_config $name
 
@@ -58,7 +60,12 @@ mail_room_enabled=false
 mail_room_pid_path="$pid_path/mail_room.pid"
 gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
 gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
-gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend $gitlab_authBackend -authSocket $rails_socket -documentRoot $app_root/public"
+if checkyesno gitlab_workhorse_tcp; then
+        gitlab_workhorse_listen="-listenNetwork tcp -listenAddr $gitlab_workhorse_addr"
+else
+        gitlab_workhorse_listen="-listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket"
+fi
+gitlab_workhorse_options="-listenUmask 0 $gitlab_workhorse_listen -authBackend $gitlab_authBackend -authSocket $rails_socket -documentRoot $app_root/public"
 gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
 gitlab_pages_enabled=false
 gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd)
@@ -491,27 +498,54 @@ restart_gitlab(){
 
 ### Finally the input handling.
 
-case "$1" in
-  start|quietstart|faststart)
+case $gitlab_enable in
+  [yY][eE][sS])
+    case "$1" in
+      start|quietstart|faststart)
         start_gitlab
         ;;
-  stop|faststop)
+      stop|faststop)
         stop_gitlab
         ;;
-  restart)
+      restart)
         restart_gitlab
         ;;
-  reload|force-reload)
+      reload|force-reload)
 	reload_gitlab
         ;;
-  status)
+      status)
         print_status
         exit $gitlab_status
         ;;
+      *)
+        echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}"
+        exit 1
+        ;;
+    esac
+    ;;
   *)
-        echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|status}"
+    case "$1" in
+      onestart)
+        start_gitlab
+        ;;
+      onestop)
+        stop_gitlab
+        ;;
+      onerestart)
+        restart_gitlab
+        ;;
+      onreload)
+        reload_gitlab
+        ;;
+      status)
+        print_status
+        exit $gitlab_status
+        ;;
+      *)
+        echo "Usage: service gitlab {start|quietstart|faststop|stop|restart|reload|onestart|onestop|onerestart|onreload|status}"
         exit 1
         ;;
+    esac
 esac
 
 exit
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index cacdb1879d71..949c0321f1b8 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
 --- Gemfile.orig	2017-11-14 20:51:25 UTC
 +++ Gemfile
-@@ -1,12 +1,12 @@
+@@ -1,49 +1,49 @@
  source 'https://rubygems.org'
  
 -gem 'rails', '4.2.8'
@@ -15,7 +15,13 @@
  
  # Default values for AR models
  gem 'default_value_for', '~> 3.0.0'
-@@ -18,32 +18,32 @@ gem 'pg', '~> 0.18.2', group: :postgres
+ 
+ # Supported DBs
+-gem 'mysql2', '~> 0.4.5', group: :mysql
+-gem 'pg', '~> 0.18.2', group: :postgres
++gem 'mysql2', '>= 0.4.5', group: :mysql
++gem 'pg', '>= 0.18.2', group: :postgres
+ 
  gem 'rugged', '~> 0.26.0'
  gem 'grape-route-helpers', '~> 2.1.0'
  
@@ -235,7 +241,7 @@
  
  gem 'premailer-rails', '~> 1.9.7'
  
-@@ -260,7 +260,7 @@ gem 'premailer-rails', '~> 1.9.7'
+@@ -260,135 +260,51 @@ gem 'premailer-rails', '~> 1.9.7'
  gem 'ruby_parser', '~> 3.8', require: false
  gem 'rails-i18n', '~> 4.0.9'
  gem 'gettext_i18n_rails', '~> 1.8.0'
@@ -244,16 +250,18 @@
  gem 'gettext', '~> 3.2.2', require: false, group: :development
  
  # Perf bar
-@@ -268,7 +268,7 @@ gem 'peek', '~> 1.0.1'
+ gem 'peek', '~> 1.0.1'
  gem 'peek-gc', '~> 0.0.2'
  gem 'peek-host', '~> 1.0.0'
- gem 'peek-mysql2', '~> 1.1.0', group: :mysql
+-gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 -gem 'peek-performance_bar', '~> 1.3.0'
+-gem 'peek-pg', '~> 1.3.0', group: :postgres
++gem 'peek-mysql2', '>= 1.1.0', group: :mysql
 +gem 'peek-performance_bar', '>= 1.3.0'
- gem 'peek-pg', '~> 1.3.0', group: :postgres
++gem 'peek-pg', '>= 1.3.0', group: :postgres
  gem 'peek-rblineprof', '~> 0.2.0'
  gem 'peek-redis', '~> 1.2.0'
-@@ -276,119 +276,35 @@ gem 'peek-sidekiq', '~> 1.0.3'
+ gem 'peek-sidekiq', '~> 1.0.3'
  
  # Metrics
  group :metrics do
diff --git a/www/gitlab/files/patch-config_database.yml.postgresql b/www/gitlab/files/patch-config_database.yml.postgresql
index 028afde59b51..352b21431b4d 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-06-07 20:58:14 UTC
+--- config/database.yml.postgresql.orig	2017-11-14 20:51:25 UTC
 +++ config/database.yml.postgresql
 @@ -6,7 +6,7 @@ production:
    encoding: unicode
@@ -8,4 +8,4 @@
 +  username: git
    # password:
    # host: localhost
-   # port: 5432 
+   # port: 5432
diff --git a/www/gitlab/pkg-plist b/www/gitlab/pkg-plist
index 16d29bedc057..bf72d549b8f8 100644
--- a/www/gitlab/pkg-plist
+++ b/www/gitlab/pkg-plist
@@ -5795,11 +5795,11 @@
 %%WWWDIR%%/db/migrate/20170720130749_add_foreign_key_to_ci_pipeline_variables.rb
 %%WWWDIR%%/db/migrate/20170724214302_add_lower_path_index_to_redirect_routes.rb
 %%WWWDIR%%/db/migrate/20170725145659_add_binary_to_merge_request_diff_files.rb
-%%WWWDIR%%/db/migrate/201707271%%RUBY_SUFFIX%%534_add_index_on_events_project_id_id.rb
+%%WWWDIR%%/db/migrate/20170727123534_add_index_on_events_project_id_id.rb
 %%WWWDIR%%/db/migrate/20170731175128_add_percentages_to_conv_dev.rb
 %%WWWDIR%%/db/migrate/20170731183033_add_merge_jid_to_merge_requests.rb
 %%WWWDIR%%/db/migrate/20170802013652_add_storage_fields_to_project.rb
-%%WWWDIR%%/db/migrate/20170803130%%RUBY_SUFFIX%%2_reorganise_issues_indexes_for_faster_sorting.rb
+%%WWWDIR%%/db/migrate/20170803130232_reorganise_issues_indexes_for_faster_sorting.rb
 %%WWWDIR%%/db/migrate/20170807071105_add_hashed_storage_to_settings.rb
 %%WWWDIR%%/db/migrate/20170809133343_add_broadcast_messages_index.rb
 %%WWWDIR%%/db/migrate/20170809134534_add_broadcast_message_not_null_constraints.rb
@@ -5810,8 +5810,8 @@
 %%WWWDIR%%/db/migrate/20170816133940_add_protected_to_ci_builds.rb
 %%WWWDIR%%/db/migrate/20170816143940_add_protected_to_ci_pipelines.rb
 %%WWWDIR%%/db/migrate/20170816153940_add_index_on_ci_builds_protected.rb
-%%WWWDIR%%/db/migrate/20170816%%RUBY_SUFFIX%%4252_add_theme_id_to_users.rb
-%%WWWDIR%%/db/migrate/201708171%%RUBY_SUFFIX%%339_add_verification_status_to_gpg_signatures.rb
+%%WWWDIR%%/db/migrate/20170816234252_add_theme_id_to_users.rb
+%%WWWDIR%%/db/migrate/20170817123339_add_verification_status_to_gpg_signatures.rb
 %%WWWDIR%%/db/migrate/20170820100558_correct_protected_tags_foreign_keys.rb
 %%WWWDIR%%/db/migrate/20170820120108_create_user_synced_attributes_metadata.rb
 %%WWWDIR%%/db/migrate/20170824101926_add_auto_devops_enabled_to_application_settings.rb
@@ -5832,17 +5832,17 @@
 %%WWWDIR%%/db/migrate/20170913131410_environments_project_id_not_null.rb
 %%WWWDIR%%/db/migrate/20170914135630_add_index_for_recent_push_events.rb
 %%WWWDIR%%/db/migrate/20170918222253_reorganize_deployments_indexes.rb
-%%WWWDIR%%/db/migrate/201709182%%RUBY_SUFFIX%%303_add_deployments_index_for_last_deployment.rb
+%%WWWDIR%%/db/migrate/20170918223303_add_deployments_index_for_last_deployment.rb
 %%WWWDIR%%/db/migrate/20170919211300_remove_temporary_ci_builds_index.rb
 %%WWWDIR%%/db/migrate/20170921115009_add_project_repository_storage_index.rb
 %%WWWDIR%%/db/migrate/20170924094327_create_gcp_clusters.rb
 %%WWWDIR%%/db/migrate/20170927095921_add_ci_builds_index_for_jobscontroller.rb
 %%WWWDIR%%/db/migrate/20170927122209_add_partial_index_for_labels_template.rb
 %%WWWDIR%%/db/migrate/20170927161718_create_gpg_key_subkeys.rb
-%%WWWDIR%%/db/migrate/20170928100%%RUBY_SUFFIX%%1_add_composite_index_on_merge_requests_merge_commit_sha.rb
+%%WWWDIR%%/db/migrate/20170928100231_add_composite_index_on_merge_requests_merge_commit_sha.rb
 %%WWWDIR%%/db/migrate/20170928124105_create_fork_networks.rb
 %%WWWDIR%%/db/migrate/20170928133643_create_fork_network_members.rb
-%%WWWDIR%%/db/migrate/20170929080%%RUBY_SUFFIX%%4_add_failure_reason_to_pipelines.rb
+%%WWWDIR%%/db/migrate/20170929080234_add_failure_reason_to_pipelines.rb
 %%WWWDIR%%/db/migrate/20170929131201_populate_fork_networks.rb
 %%WWWDIR%%/db/migrate/20171004121444_make_sure_fast_forward_option_exists.rb
 %%WWWDIR%%/db/migrate/20171006090001_create_ci_build_trace_sections.rb
@@ -5931,12 +5931,12 @@
 %%WWWDIR%%/db/post_migrate/20170830084744_destroy_gpg_signatures.rb
 %%WWWDIR%%/db/post_migrate/20170830150306_drop_events_for_migration_table.rb
 %%WWWDIR%%/db/post_migrate/20170831195038_remove_valid_signature_from_gpg_signatures.rb
-%%WWWDIR%%/db/post_migrate/20170907170%%RUBY_SUFFIX%%5_delete_conflicting_redirect_routes.rb
+%%WWWDIR%%/db/post_migrate/20170907170235_delete_conflicting_redirect_routes.rb
 %%WWWDIR%%/db/post_migrate/20170913180600_fix_projects_without_project_feature.rb
 %%WWWDIR%%/db/post_migrate/20170921101004_normalize_ldap_extern_uids.rb
 %%WWWDIR%%/db/post_migrate/20170926150348_schedule_merge_request_diff_migrations_take_two.rb
-%%WWWDIR%%/db/post_migrate/2017092711%%RUBY_SUFFIX%%18_update_legacy_diff_notes_type_for_import.rb
-%%WWWDIR%%/db/post_migrate/2017092711%%RUBY_SUFFIX%%19_update_notes_type_for_import.rb
+%%WWWDIR%%/db/post_migrate/20170927112318_update_legacy_diff_notes_type_for_import.rb
+%%WWWDIR%%/db/post_migrate/20170927112319_update_notes_type_for_import.rb
 %%WWWDIR%%/db/post_migrate/20171005130944_schedule_create_gpg_key_subkeys_from_gpg_keys.rb
 @(git,,) %%WWWDIR%%/db/schema.rb
 %%WWWDIR%%/db/seeds.rb