Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jan 2020 16:15:34 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r521948 - in head/www/gitlab-ce: . files
Message-ID:  <202001031615.003GFYHc052375@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Fri Jan  3 16:15:34 2020
New Revision: 521948
URL: https://svnweb.freebsd.org/changeset/ports/521948

Log:
  Security upgrade to 12.6.2.
  Changelog:
  https://about.gitlab.com/blog/2020/01/02/security-release-gitlab-12-6-2-released/
  
  MFH:		2020Q1
  Security:	01bde18a-2e09-11ea-a935-001b217b3468

Modified:
  head/www/gitlab-ce/Makefile
  head/www/gitlab-ce/distinfo
  head/www/gitlab-ce/files/patch-config_gitlab.yml.example

Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile	Fri Jan  3 16:12:56 2020	(r521947)
+++ head/www/gitlab-ce/Makefile	Fri Jan  3 16:15:34 2020	(r521948)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	12.6.1
-PORTREVISION=	4
+PORTVERSION=	12.6.2
+PORTREVISION=	0
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -240,7 +240,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	a0094541f8725b2f9852086033be08d20caa4f01
+GL_COMMIT=	3041661dec5d75d18b06ffa26e82bdfff3132f21
 
 USERS=	git
 GROUPS=	git

Modified: head/www/gitlab-ce/distinfo
==============================================================================
--- head/www/gitlab-ce/distinfo	Fri Jan  3 16:12:56 2020	(r521947)
+++ head/www/gitlab-ce/distinfo	Fri Jan  3 16:15:34 2020	(r521948)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577538634
-SHA256 (gitlab-org-gitlab-foss-a0094541f8725b2f9852086033be08d20caa4f01_GL0.tar.gz) = ad23fdfdd8b1ee75002f1cd32f5d6c0a53743d04c888b7e658ddda9840c7544e
-SIZE (gitlab-org-gitlab-foss-a0094541f8725b2f9852086033be08d20caa4f01_GL0.tar.gz) = 99797830
+TIMESTAMP = 1578065890
+SHA256 (gitlab-org-gitlab-foss-3041661dec5d75d18b06ffa26e82bdfff3132f21_GL0.tar.gz) = e300c710c5497134fda9303d4e18f9458a391a10fe8673d381226b56e7f132a9
+SIZE (gitlab-org-gitlab-foss-3041661dec5d75d18b06ffa26e82bdfff3132f21_GL0.tar.gz) = 99797386

Modified: head/www/gitlab-ce/files/patch-config_gitlab.yml.example
==============================================================================
--- head/www/gitlab-ce/files/patch-config_gitlab.yml.example	Fri Jan  3 16:12:56 2020	(r521947)
+++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example	Fri Jan  3 16:15:34 2020	(r521948)
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2019-12-03 11:22:02 UTC
+--- config/gitlab.yml.example.orig	2020-01-02 15:06:44 UTC
 +++ config/gitlab.yml.example
-@@ -902,7 +902,7 @@ production: &base
+@@ -910,7 +910,7 @@ production: &base
    # Gitaly settings
    gitaly:
      # Path to the directory containing Gitaly client executables.
@@ -9,7 +9,7 @@
      # Default Gitaly authentication token. Can be overridden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -920,8 +920,8 @@ production: &base
+@@ -928,8 +928,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -20,7 +20,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -967,12 +967,12 @@ production: &base
+@@ -975,12 +975,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -36,7 +36,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -997,7 +997,7 @@ production: &base
+@@ -1005,7 +1005,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001031615.003GFYHc052375>