svn commit: r474954 - in branches/2018Q3: . www www/gitlab www/gitlab-ce www/gitlab-ce/files
Matthias Fechner
mfechner at FreeBSD.org
Thu Jul 19 10:02:41 UTC 2018
Author: mfechner
Date: Thu Jul 19 10:02:38 2018
New Revision: 474954
URL: https://svnweb.freebsd.org/changeset/ports/474954
Log:
MFH: r473910 r473925 r474258 r474906
Updated gitlab to 11.0.2.
For detailed list of changes please see here:
https://about.gitlab.com/2018/06/22/gitlab-11-0-released/
Please make sure before you upgrade you read the entry in UPDATING.
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D16127
Renamed gitlab to gitlab-ce in Makefile.
PR: 229519
Reported by: Trond.Endrestol at ximalas.info
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D16127
Upgrade gitlab to 11.0.3 and fix problem with sidekiq-cron reported by swills which requires rubygem-rufus-scheduler version 3.4.0, alle other newer versions are failing.
PR: 229557
Reported by: swills
Reviewed by: tz (mentor)
Approved by: tz (mentor)
Differential Revision: https://reviews.freebsd.org/D16160
Made it possible to use another PREFIX for gitlab-ce.
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D16266
Approved by: ports-secteam (miwi)
Added:
branches/2018Q3/www/gitlab-ce/
- copied from r473910, head/www/gitlab-ce/
Deleted:
branches/2018Q3/www/gitlab/
Modified:
branches/2018Q3/MOVED
branches/2018Q3/UPDATING
branches/2018Q3/www/Makefile
branches/2018Q3/www/gitlab-ce/Makefile
branches/2018Q3/www/gitlab-ce/distinfo
branches/2018Q3/www/gitlab-ce/files/gitlab.in
branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example
branches/2018Q3/www/gitlab-ce/files/patch-config_unicorn.rb.example
branches/2018Q3/www/gitlab-ce/files/patch-lib_support_nginx_gitlab
branches/2018Q3/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl
branches/2018Q3/www/gitlab-ce/pkg-plist
Directory Properties:
branches/2018Q3/ (props changed)
Modified: branches/2018Q3/MOVED
==============================================================================
--- branches/2018Q3/MOVED Thu Jul 19 09:57:52 2018 (r474953)
+++ branches/2018Q3/MOVED Thu Jul 19 10:02:38 2018 (r474954)
@@ -10294,3 +10294,4 @@ www/libxul||2018-06-22|Has expired: NPAPI are no longe
mail/postfix211||2018-06-24|Has expired: Not supported anymore by vendor. Please choose a new one version
mail/postfix211-sasl||2018-06-24|Has expired: Not supported anymore by vendor. Please choose a new one version
devel/py-binplist||2018-06-26|Has expired: Not depended upon anymore, no longer maintained upstream
+www/gitlab|www/gitlab-ce|2018-07-04|Port renamed to match name on gitlab.org
Modified: branches/2018Q3/UPDATING
==============================================================================
--- branches/2018Q3/UPDATING Thu Jul 19 09:57:52 2018 (r474953)
+++ branches/2018Q3/UPDATING Thu Jul 19 10:02:38 2018 (r474954)
@@ -5,6 +5,23 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20180704:
+ AFFECTS: users of www/gitlab
+ AUTHOR: mfechner at FreeBSD.org
+
+ The gitlab port uses the package from gitlab.org instead of github.org.
+ For this the port was renamed from gitlab to gitlab-ce.
+ Please follow the instructions very carefully to not lose your data!
+ Not only the package was renamed, also the directory name changed.
+
+ You can find the current instruction here:
+ https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.8-11.0-freebsd.md
+
+ Please note the update was only tested for an update from 10.8.5 to 11.0.2.
+ If your version of gitlab was released before 2014-03-13 you cannot update
+ to this version. You need to make an intermediate update to an earlier
+ version before.
+
20180701:
AFFECTS: users of devel/bats
AUTHOR: lifanov at FreeBSD.org
Modified: branches/2018Q3/www/Makefile
==============================================================================
--- branches/2018Q3/www/Makefile Thu Jul 19 09:57:52 2018 (r474953)
+++ branches/2018Q3/www/Makefile Thu Jul 19 10:02:38 2018 (r474954)
@@ -200,7 +200,7 @@
SUBDIR += getleft
SUBDIR += gist
SUBDIR += gitea
- SUBDIR += gitlab
+ SUBDIR += gitlab-ce
SUBDIR += gitlab-pages
SUBDIR += gitlab-workhorse
SUBDIR += glassfish
Modified: branches/2018Q3/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/Makefile Thu Jul 19 10:02:38 2018 (r474954)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 11.0.2
+PORTVERSION= 11.0.3
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -120,7 +120,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \
rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \
rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \
- rubygem-rufus-scheduler>=3.4.0:devel/rubygem-rufus-scheduler \
+ rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \
rubygem-httparty>=0.13.3:www/rubygem-httparty \
rubygem-rainbow2>=2.2:devel/rubygem-rainbow2 \
rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \
@@ -213,13 +213,19 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT= d9540ee0464796746ec0906c0c2762ca099be3e5
+GL_COMMIT= aa6207551b023ecba0dba332c6358e1007f4b0eb
USERS= git
GROUPS= git
NO_ARCH= yes
NO_BUILD= yes
+
+post-patch:
+ ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \
+ ${WRKSRC}/config/unicorn.rb.example \
+ ${WRKSRC}/lib/support/nginx/gitlab \
+ ${WRKSRC}/lib/support/nginx/gitlab-ssl
post-patch-MYSQL-on:
${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
Modified: branches/2018Q3/www/gitlab-ce/distinfo
==============================================================================
--- head/www/gitlab-ce/distinfo Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/distinfo Thu Jul 19 10:02:38 2018 (r474954)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530451249
-SHA256 (gitlab-org-gitlab-ce-d9540ee0464796746ec0906c0c2762ca099be3e5_GL0.tar.gz) = 7b28ed31240324079d8a0fcdc8f5bd2b654dad4206c1d67f741e5dfa32ce447e
-SIZE (gitlab-org-gitlab-ce-d9540ee0464796746ec0906c0c2762ca099be3e5_GL0.tar.gz) = 49735059
+TIMESTAMP = 1530814728
+SHA256 (gitlab-org-gitlab-ce-aa6207551b023ecba0dba332c6358e1007f4b0eb_GL0.tar.gz) = b3e32c199deca93729eed2c6b20fb23b35962fcbc249045a89abea7e05342782
+SIZE (gitlab-org-gitlab-ce-aa6207551b023ecba0dba332c6358e1007f4b0eb_GL0.tar.gz) = 49743048
Modified: branches/2018Q3/www/gitlab-ce/files/gitlab.in
==============================================================================
--- head/www/gitlab-ce/files/gitlab.in Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/files/gitlab.in Thu Jul 19 10:02:38 2018 (r474954)
@@ -24,7 +24,7 @@
#
# gitlab_enable="YES"
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin"
. /etc/rc.subr
@@ -51,7 +51,7 @@ RAILS_ENV="production"
# Script variable names should be lower-case not to conflict with
# internal /bin/sh variables such as PATH, EDITOR or SHELL.
app_user="git"
-app_root="/usr/local/www/gitlab-ce"
+app_root="%%PREFIX%%/www/gitlab-ce"
pid_path="$app_root/tmp/pids"
socket_path="$app_root/tmp/sockets"
rails_socket="$socket_path/gitlab.socket"
@@ -79,7 +79,7 @@ gitlab_pages_options="-pages-domain example.com -pages
gitlab_pages_log="$app_root/log/gitlab-pages.log"
shell_path="/bin/bash"
gitaly_enabled=true
-gitaly_dir="/usr/local/share/gitaly"
+gitaly_dir="%%PREFIX%%/share/gitaly"
gitaly_pid_path="$pid_path/gitaly.pid"
gitaly_log="$app_root/log/gitaly.log"
@@ -91,18 +91,18 @@ if [ "$USER" != "$app_user" ]; then
# Regenerate the Gemfile.lock for all related products
echo "Regenerate Gitlab Gemfile.lock"
rm -f "${app_root}"/Gemfile.lock
- if ! su -l ${app_user} -c "cd ${app_root} && /usr/local/bin/bundle install --local --quiet"; then
+ if ! su -l ${app_user} -c "cd ${app_root} && %%LOCALBASE%%/bin/bundle install --local --quiet"; then
echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/"
exit 1
fi
echo "Regenerate Gitaly Gemfile.lock"
rm -f "${gitaly_dir}"/ruby/Gemfile.lock
- if ! su -l root -c "cd ${gitaly_dir}/ruby && /usr/local/bin/bundle install --local --quiet"; then
+ if ! su -l root -c "cd ${gitaly_dir}/ruby && %%LOCALBASE%%/bin/bundle install --local --quiet"; then
echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/"
exit 1
fi
- eval su - "$app_user" -c $(echo \")/usr/local/etc/rc.d/gitlab "$@"$(echo \"); exit;
+ eval su - "$app_user" -c $(echo \")%%LOCALBASE%%/etc/rc.d/gitlab "$@"$(echo \"); exit;
fi
# Switch to the gitlab path, exit on failure.
Modified: branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab-ce/files/patch-config_gitlab.yml.example Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/files/patch-config_gitlab.yml.example Thu Jul 19 10:02:38 2018 (r474954)
@@ -5,7 +5,7 @@
# external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
admin:
- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
-+ address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
++ address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
## Mattermost
## For enabling Add to Mattermost button
@@ -14,7 +14,7 @@
gitaly:
# Path to the directory containing Gitaly client executables.
- client_path: /home/git/gitaly/bin
-+ client_path: /usr/local/share/gitaly/bin
++ client_path: %%PREFIX%%/share/gitaly/bin
# Default Gitaly authentication token. Can be overriden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
@@ -25,7 +25,7 @@
- path: /home/git/repositories/
- gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
+ path: /usr/home/git/repositories/
-+ gitaly_address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
++ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -35,8 +35,8 @@
gitlab_shell:
- path: /home/git/gitlab-shell/
- hooks_path: /home/git/gitlab-shell/hooks/
-+ path: /usr/local/share/gitlab-shell/
-+ hooks_path: /usr/local/share/gitlab-shell/hooks/
++ path: %%PREFIX%%/share/gitlab-shell/
++ hooks_path: %%PREFIX/share/gitlab-shell/hooks/
# File that contains the secret key for verifying access for gitlab-shell.
# Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -50,7 +50,7 @@
# Use the default values unless you really know what you are doing
git:
- bin_path: /usr/bin/git
-+ bin_path: /usr/local/bin/git
++ bin_path: %%PREFIX%%/bin/git
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
Modified: branches/2018Q3/www/gitlab-ce/files/patch-config_unicorn.rb.example
==============================================================================
--- head/www/gitlab-ce/files/patch-config_unicorn.rb.example Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/files/patch-config_unicorn.rb.example Thu Jul 19 10:02:38 2018 (r474954)
@@ -5,13 +5,13 @@
# Help ensure your application will always spawn in the symlinked
# "current" directory that Capistrano sets up.
-working_directory "/home/git/gitlab" # available in 0.94.0+
-+working_directory "/usr/local/www/gitlab-ce" # available in 0.94.0+
++working_directory "%%PREFIX%%/www/gitlab-ce" # available in 0.94.0+
# Listen on both a Unix domain socket and a TCP port.
# If you are load-balancing multiple Unicorn masters, lower the backlog
# setting to e.g. 64 for faster failover.
-listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
-+listen "/usr/local/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024
++listen "%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024
listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default)
@@ -20,15 +20,15 @@
# feel free to point this anywhere accessible on the filesystem
-pid "/home/git/gitlab/tmp/pids/unicorn.pid"
-+pid "/usr/local/www/gitlab-ce/tmp/pids/unicorn.pid"
++pid "%%PREFIX%%/www/gitlab-ce/tmp/pids/unicorn.pid"
# By default, the Unicorn logger will write to stderr.
# Additionally, some applications/frameworks log to stderr or stdout,
# so prevent them from going to /dev/null when daemonized here:
-stderr_path "/home/git/gitlab/log/unicorn.stderr.log"
-stdout_path "/home/git/gitlab/log/unicorn.stdout.log"
-+stderr_path "/usr/local/www/gitlab-ce/log/unicorn.stderr.log"
-+stdout_path "/usr/local/www/gitlab-ce/log/unicorn.stdout.log"
++stderr_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stderr.log"
++stdout_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stdout.log"
# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
Modified: branches/2018Q3/www/gitlab-ce/files/patch-lib_support_nginx_gitlab
==============================================================================
--- head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/files/patch-lib_support_nginx_gitlab Thu Jul 19 10:02:38 2018 (r474954)
@@ -5,7 +5,7 @@
# Gitlab socket file,
# for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
- server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-+ server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
++ server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
}
map $http_upgrade $connection_upgrade_gitlab {
@@ -14,7 +14,7 @@
# Location to the Gitlab's public directory,
# for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public.
- root /home/git/gitlab/public;
-+ root /usr/local/www/gitlab-ce/public;
++ root %%PREFIX%%/www/gitlab-ce/public;
internal;
}
Modified: branches/2018Q3/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl
==============================================================================
--- head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl Thu Jul 19 10:02:38 2018 (r474954)
@@ -5,7 +5,7 @@
# Gitlab socket file,
# for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
- server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-+ server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
++ server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
}
map $http_upgrade $connection_upgrade_gitlab_ssl {
@@ -14,7 +14,7 @@
# Location to the Gitlab's public directory,
# for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public
- root /home/git/gitlab/public;
-+ root /usr/local/www/gitlab-ce/public;
++ root %%PREFIX%%/www/gitlab-ce/public;
internal;
}
}
Modified: branches/2018Q3/www/gitlab-ce/pkg-plist
==============================================================================
--- head/www/gitlab-ce/pkg-plist Wed Jul 4 17:38:29 2018 (r473910)
+++ branches/2018Q3/www/gitlab-ce/pkg-plist Thu Jul 19 10:02:38 2018 (r474954)
@@ -10234,6 +10234,7 @@
%%WWWDIR%%/spec/features/groups/group_settings_spec.rb
%%WWWDIR%%/spec/features/groups/issues_spec.rb
%%WWWDIR%%/spec/features/groups/labels/edit_spec.rb
+%%WWWDIR%%/spec/features/groups/labels/index_spec.rb
%%WWWDIR%%/spec/features/groups/labels/subscription_spec.rb
%%WWWDIR%%/spec/features/groups/labels/user_sees_links_to_issuables.rb
%%WWWDIR%%/spec/features/groups/members/filter_members_spec.rb
@@ -12945,6 +12946,7 @@
%%WWWDIR%%/spec/services/preview_markdown_service_spec.rb
%%WWWDIR%%/spec/services/projects/after_import_service_spec.rb
%%WWWDIR%%/spec/services/projects/autocomplete_service_spec.rb
+%%WWWDIR%%/spec/services/projects/batch_open_issues_count_service_spec.rb
%%WWWDIR%%/spec/services/projects/count_service_spec.rb
%%WWWDIR%%/spec/services/projects/create_from_template_service_spec.rb
%%WWWDIR%%/spec/services/projects/create_service_spec.rb
More information about the svn-ports-all
mailing list