svn commit: r478553 - branches/2018Q3/www/gitlab-ce
Matthias Fechner
mfechner at FreeBSD.org
Fri Aug 31 12:28:58 UTC 2018
Author: mfechner
Date: Fri Aug 31 12:28:56 2018
New Revision: 478553
URL: https://svnweb.freebsd.org/changeset/ports/478553
Log:
MFH: r476329 r477216 r478496
Update gitlab to 11.1.4.
Fixed dependency problem for security/doorkeeper.
The currently used doorkeeper43 version has a security vulnerability, this problem was reported upstream to gitlab here:
https://gitlab.com/gitlab-org/gitlab-ce/issues/49940
PR: 230306
Approved by: mentors (implicit)
www/gitlab-ce add a check after the build process to verify all used gems matching the requirements.
This should make it easier to see gem updates that are breaking the gitlab-ce port.
Approved by: mentors (implicit)
www/gitlab-ce security update to version 11.1.6.
Details about vulnerabilities can be found here:
https://about.gitlab.com/2018/08/28/security-release-gitlab-11-dot-2-dot-2-released/
Approved by: mentors (implicit)
MFC after: 1 d
Security: ffeb25d0-ac94-11e8-ab15-d8cb8abf62dd
Approved by: ports-secteam (miwi)
Modified:
branches/2018Q3/www/gitlab-ce/Makefile
branches/2018Q3/www/gitlab-ce/distinfo
branches/2018Q3/www/gitlab-ce/pkg-plist
Directory Properties:
branches/2018Q3/ (props changed)
Modified: branches/2018Q3/www/gitlab-ce/Makefile
==============================================================================
--- branches/2018Q3/www/gitlab-ce/Makefile Fri Aug 31 12:26:44 2018 (r478552)
+++ branches/2018Q3/www/gitlab-ce/Makefile Fri Aug 31 12:28:56 2018 (r478553)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 11.1.2
+PORTVERSION= 11.1.6
CATEGORIES= www devel
MAINTAINER= mfechner at FreeBSD.org
@@ -40,7 +40,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-grape-path-helpers>=1.0:devel/rubygem-grape-path-helpers \
rubygem-faraday>=0.12.0:www/rubygem-faraday \
rubygem-devise>=4.4:devel/rubygem-devise \
- rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \
+ rubygem-doorkeeper43>=4.3:security/rubygem-doorkeeper43 \
rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \
rubygem-omniauth>=1.8:security/rubygem-omniauth \
rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \
@@ -213,7 +213,7 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT= 35936b0b6282db026128d21abe8f3490c1d376f2
+GL_COMMIT= 014912084ddfbafa35da6d52f1b1b46b601bfc62
USERS= git
GROUPS= git
@@ -240,6 +240,9 @@ post-patch-PGSQL-on:
post-patch-PGSQL-off:
${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile
${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile
+
+pre-install:
+ (cd ${WRKSRC} && rm Gemfile.lock && bundle install --local)
do-install:
${FIND} ${WRKSRC} -name '*.orig' -delete
Modified: branches/2018Q3/www/gitlab-ce/distinfo
==============================================================================
--- branches/2018Q3/www/gitlab-ce/distinfo Fri Aug 31 12:26:44 2018 (r478552)
+++ branches/2018Q3/www/gitlab-ce/distinfo Fri Aug 31 12:28:56 2018 (r478553)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532671627
-SHA256 (gitlab-org-gitlab-ce-35936b0b6282db026128d21abe8f3490c1d376f2_GL0.tar.gz) = 732295b8fa10381ae867042fd1173e86033014b8f76ddbc8f5cc70bc324a718e
-SIZE (gitlab-org-gitlab-ce-35936b0b6282db026128d21abe8f3490c1d376f2_GL0.tar.gz) = 51962312
+TIMESTAMP = 1535648221
+SHA256 (gitlab-org-gitlab-ce-014912084ddfbafa35da6d52f1b1b46b601bfc62_GL0.tar.gz) = d7c9af8398266c51869dc8124cb5ceb88908f55def696aa4542f41f9137d848b
+SIZE (gitlab-org-gitlab-ce-014912084ddfbafa35da6d52f1b1b46b601bfc62_GL0.tar.gz) = 51958008
Modified: branches/2018Q3/www/gitlab-ce/pkg-plist
==============================================================================
--- branches/2018Q3/www/gitlab-ce/pkg-plist Fri Aug 31 12:26:44 2018 (r478552)
+++ branches/2018Q3/www/gitlab-ce/pkg-plist Fri Aug 31 12:28:56 2018 (r478553)
@@ -6948,6 +6948,7 @@
%%WWWDIR%%/db/post_migrate/20180608201435_cleanup_merge_requests_allow_collaboration_rename.rb
%%WWWDIR%%/db/post_migrate/20180629191052_add_partial_index_to_projects_for_last_repository_check_at.rb
%%WWWDIR%%/db/post_migrate/20180702120647_enqueue_fix_cross_project_label_links.rb
+%%WWWDIR%%/db/post_migrate/20180704145007_update_project_indexes.rb
@(git,,) %%WWWDIR%%/db/schema.rb
%%WWWDIR%%/db/seeds.rb
%%WWWDIR%%/doc/README.md
@@ -12047,6 +12048,7 @@
%%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_marker_spec.rb
%%WWWDIR%%/spec/lib/gitlab/diff/inline_diff_spec.rb
%%WWWDIR%%/spec/lib/gitlab/diff/line_mapper_spec.rb
+%%WWWDIR%%/spec/lib/gitlab/diff/line_spec.rb
%%WWWDIR%%/spec/lib/gitlab/diff/parallel_diff_spec.rb
%%WWWDIR%%/spec/lib/gitlab/diff/parser_spec.rb
%%WWWDIR%%/spec/lib/gitlab/diff/position_spec.rb
More information about the svn-ports-all
mailing list