git: ce19b5a3fa5f - main - www/gitlab-workhorse: update to 14.7.0

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Wed, 26 Jan 2022 10:43:33 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ce19b5a3fa5fbe96e78a5330f5595da8eac77565

commit ce19b5a3fa5fbe96e78a5330f5595da8eac77565
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-01-26 07:15:09 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2022-01-26 10:43:01 +0000

    www/gitlab-workhorse: update to 14.7.0
    
    Required for gitlab-ce 14.7.
---
 www/gitlab-workhorse/Makefile           | 5 ++---
 www/gitlab-workhorse/distinfo           | 8 +++-----
 www/gitlab-workhorse/files/patch-go.mod | 4 ++--
 www/gitlab-workhorse/files/patch-go.sum | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index a382b12f6e20..220ea29ad722 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,7 +1,7 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	14.6.3
+PORTVERSION=	14.7.0
 PORTREVISION=	0
 CATEGORIES=	www
 
@@ -25,7 +25,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT=	0a901d60f8ae4a60c04ae82e6e9c3a03e9321417
+GL_COMMIT=	abbf44bd6cfb29413b3cf5768b691e5b222b89ea
 
 # for go dependencies
 USE_GITHUB=	nodefault
@@ -43,7 +43,6 @@ GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		DataDog:datadog-go:v4.4.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \
 		DataDog:dd-trace-go:v1.31.1:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
-		DataDog:sketches-go:v1.0.0:datadog_sketches_go/vendor/github.com/DataDog/sketches-go \
 		FZambia:sentinel:v1.0.0:fzambia_sentinel/vendor/github.com/FZambia/sentinel \
 		Microsoft:go-winio:v0.4.19:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index c439b4ea4167..dcabaebd2bdf 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1642666936
+TIMESTAMP = 1643177939
 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
 SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
@@ -21,8 +21,6 @@ SHA256 (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = ca4e63041f5e0a176f0affd7a5997925
 SIZE (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = 43175
 SHA256 (DataDog-dd-trace-go-v1.31.1_GH0.tar.gz) = 9e16bb928d2445fd3430b25b0acbb562077a4c93ad737eeed67bcb38eac8c9ab
 SIZE (DataDog-dd-trace-go-v1.31.1_GH0.tar.gz) = 601733
-SHA256 (DataDog-sketches-go-v1.0.0_GH0.tar.gz) = 882d27e9f2b65f8b1de6f0f53fe141044df31ccc02abb6ca12d7a74ebd8b7b7b
-SIZE (DataDog-sketches-go-v1.0.0_GH0.tar.gz) = 22089
 SHA256 (FZambia-sentinel-v1.0.0_GH0.tar.gz) = ae08e912e4fd69a0c5d11f832a484f13695ce20e8d32878eba23bc89d9d79e5e
 SIZE (FZambia-sentinel-v1.0.0_GH0.tar.gz) = 7919
 SHA256 (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = aa80cb2aa45ffd97808c2365c554f839757408f822a0774a356b7b918360fc20
@@ -199,8 +197,8 @@ SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5
 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139
 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc
 SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
-SHA256 (gitlab-org-gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417_GL0.tar.gz) = 6dc41101331026a8c79b67fd4f64e64913cb80fbf1f5076693cf3464794bdfc3
-SIZE (gitlab-org-gitlab-foss-0a901d60f8ae4a60c04ae82e6e9c3a03e9321417_GL0.tar.gz) = 101493694
+SHA256 (gitlab-org-gitlab-foss-abbf44bd6cfb29413b3cf5768b691e5b222b89ea_GL0.tar.gz) = 73e49150461abb2a30190d2cec7a8767b5f40a59e854fd6244878acc597da17e
+SIZE (gitlab-org-gitlab-foss-abbf44bd6cfb29413b3cf5768b691e5b222b89ea_GL0.tar.gz) = 101606916
 SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e
 SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056
 SHA256 (gitlab-org-golang-archive-zip-84007c99e03b62ee4dc62a94048d6e59552299d7_GL0.tar.gz) = 103a3e806657de5e2c7844326146c88490089fa8d07784270c359b5f5a8d06be
diff --git a/www/gitlab-workhorse/files/patch-go.mod b/www/gitlab-workhorse/files/patch-go.mod
index 507f4c7b4584..91f7925fb557 100644
--- a/www/gitlab-workhorse/files/patch-go.mod
+++ b/www/gitlab-workhorse/files/patch-go.mod
@@ -1,6 +1,6 @@
---- go.mod.orig	2021-10-22 06:09:00 UTC
+--- go.mod.orig	2022-01-21 10:23:10 UTC
 +++ go.mod
-@@ -36,6 +36,6 @@ require (
+@@ -37,6 +37,6 @@ require (
  	golang.org/x/net v0.0.0-20210505214959-0714010a04ed
  	golang.org/x/tools v0.1.0
  	google.golang.org/grpc v1.38.0
diff --git a/www/gitlab-workhorse/files/patch-go.sum b/www/gitlab-workhorse/files/patch-go.sum
index 115eefd1eb72..09db1be494fa 100644
--- a/www/gitlab-workhorse/files/patch-go.sum
+++ b/www/gitlab-workhorse/files/patch-go.sum
@@ -1,4 +1,4 @@
---- go.sum.orig	2021-10-22 06:12:32 UTC
+--- go.sum.orig	2022-01-21 10:23:10 UTC
 +++ go.sum
 @@ -100,6 +100,8 @@ github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmd
  github.com/DataDog/datadog-go v4.4.0+incompatible h1:R7WqXWP4fIOAqWJtUKmSfuc7eDsBT58k9AY5WSHVosk=
@@ -17,7 +17,7 @@
  github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
  github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE=
  github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-@@ -1327,6 +1330,8 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8H
+@@ -1329,6 +1332,8 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8H
  gopkg.in/DataDog/dd-trace-go.v1 v1.30.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8=
  gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 h1:ouY+DNlRTckk63TNh468tPWBC21qBZPniVQXQs0iq10=
  gopkg.in/DataDog/dd-trace-go.v1 v1.31.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8=