Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Dec 2020 16:34:10 +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: r558916 - head/devel/gitaly
Message-ID:  <202012221634.0BMGYAqo008107@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Tue Dec 22 16:34:09 2020
New Revision: 558916
URL: https://svnweb.freebsd.org/changeset/ports/558916

Log:
  Update to 13.7.0 which is required fpr gitlab 13.7.

Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/devel/gitaly/pkg-plist

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Tue Dec 22 16:26:29 2020	(r558915)
+++ head/devel/gitaly/Makefile	Tue Dec 22 16:34:09 2020	(r558916)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	13.6.3
+DISTVERSION=	13.7.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -43,12 +43,12 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT=	a316b208ee7a725c06d0abe34172d0920932413f
+GL_COMMIT=	6c9022b6b7bc7abb440abde9fededc82db213c3c
 
 # for go dependencies
 USE_GITHUB=	nodefault
 # generated with: make gomod-vendor
-# 76dd
+# 83dd
 GH_TUPLE=	\
 		DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \
 		alexbrainman:sspi:4729b3d4d858:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \
@@ -58,7 +58,10 @@ GH_TUPLE=	\
 		client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \
 		cloudflare:tableflip:4baec9811f2b:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \
 		HdrHistogram:hdrhistogram-go:3a0bb77429bd:codahale_hdrhistogram_go/vendor/github.com/codahale/hdrhistogram \
+		containerd:cgroups:2819c83ced99:containerd_cgroups/vendor/github.com/containerd/cgroups \
+		coreos:go-systemd:v22.0.0:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		docker:go-units:v0.4.0:docker_go_units/vendor/github.com/docker/go-units \
 		dpotapov:go-spnego:c2c609116ad0:dpotapov_go_spnego/vendor/github.com/dpotapov/go-spnego \
 		getsentry:sentry-go:v0.7.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
 		git-lfs:git-lfs:9ea4eed5b112:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \
@@ -69,6 +72,8 @@ GH_TUPLE=	\
 		go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \
 		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
 		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
+		godbus:dbus:v5.0.3:godbus_dbus_v5/vendor/github.com/godbus/dbus/v5 \
+		gogo:protobuf:v1.3.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
 		golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
 		golang:crypto:5c72a883971a:golang_crypto/vendor/golang.org/x/crypto \
 		golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
@@ -88,6 +93,7 @@ GH_TUPLE=	\
 		grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \
 		grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \
 		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
+		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		jcmturner:aescts:v1.0.1:jcmturner_aescts/vendor/gopkg.in/jcmturner/aescts.v1 \
 		jcmturner:dnsutils:v1.0.1:jcmturner_dnsutils/vendor/gopkg.in/jcmturner/dnsutils.v1 \
 		jcmturner:gofork:v1.0.0:jcmturner_gofork/vendor/github.com/jcmturner/gofork \
@@ -95,7 +101,7 @@ GH_TUPLE=	\
 		jcmturner:rpc:v0.0.2:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v0 \
 		kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \
 		lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \
-		libgit2:git2go:v30.0.5:libgit2_git2go_v30/vendor/github.com/libgit2/git2go/v30 \
+		libgit2:git2go:v30.0.18:libgit2_git2go_v30/vendor/github.com/libgit2/git2go/v30 \
 		lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
@@ -103,10 +109,11 @@ GH_TUPLE=	\
 		oklog:ulid:v2.0.2:oklog_ulid_v2/vendor/github.com/oklog/ulid/v2 \
 		olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
 		olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \
+		opencontainers:runtime-spec:v1.0.2:opencontainers_runtime_spec/vendor/github.com/opencontainers/runtime-spec \
 		opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \
 		pelletier:go-toml:v1.8.1:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:14fe0d1b01d4:prometheus_client_model/vendor/github.com/prometheus/client_model \
@@ -124,7 +131,7 @@ GH_TUPLE=	\
 		uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
 
 GL_TUPLE=	gitlab-org:gitlab-shell:3f9890ef73dced430d86801a1efc0e93ec50890e:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \
-		gitlab-org:labkit:40dcf811328cfe956de0d89ed9276a9d4f35eddd:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+		gitlab-org:labkit:f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example

Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo	Tue Dec 22 16:26:29 2020	(r558915)
+++ head/devel/gitaly/distinfo	Tue Dec 22 16:34:09 2020	(r558916)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1607726461
+TIMESTAMP = 1608588445
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111
 SHA256 (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac27361ef2dadcb9fabbb3bf3a5ed785ebfc4e27
@@ -15,8 +15,14 @@ SHA256 (cloudflare-tableflip-4baec9811f2b_GH0.tar.gz) 
 SIZE (cloudflare-tableflip-4baec9811f2b_GH0.tar.gz) = 16376
 SHA256 (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0.tar.gz) = bf9c0b3bc04b0d4ed31e2019240a2854f650b87a383f47824f8af222e58a4001
 SIZE (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0.tar.gz) = 7738
+SHA256 (containerd-cgroups-2819c83ced99_GH0.tar.gz) = 716242603cc675f072031528fab440588dfc1350e4dc037a546234fee52ef7d9
+SIZE (containerd-cgroups-2819c83ced99_GH0.tar.gz) = 83338
+SHA256 (coreos-go-systemd-v22.0.0_GH0.tar.gz) = c531193b788f30a0927a0f1396b9010b81227b7a29c5a324cf867202e2099af4
+SIZE (coreos-go-systemd-v22.0.0_GH0.tar.gz) = 67883
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (docker-go-units-v0.4.0_GH0.tar.gz) = b411f15ca9b419880006f3944b8ec87dc3fe15cbba3beb6e04f2c03f9ea8370b
+SIZE (docker-go-units-v0.4.0_GH0.tar.gz) = 11514
 SHA256 (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 8093037eed2321f7496b3f66a3396e798463a2bb7dbf7e8bf9b0b54bc7c20a97
 SIZE (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 4294
 SHA256 (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = b5e7432442928e4b03f61d4cb97e5d0b815e6c8618fbf34aa6275aab2218b27e
@@ -37,6 +43,10 @@ SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9
 SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
 SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07
 SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816
+SHA256 (godbus-dbus-v5.0.3_GH0.tar.gz) = 49d27bde2861f5e5ab4195fddc5f38f25324aac3b32b3cc03e712cca3d2b75fa
+SIZE (godbus-dbus-v5.0.3_GH0.tar.gz) = 63630
+SHA256 (gogo-protobuf-v1.3.1_GH0.tar.gz) = 5184f06decd681fcc82f6583976111faf87189c0c2f8063b34ac2ea9ed997236
+SIZE (gogo-protobuf-v1.3.1_GH0.tar.gz) = 2038188
 SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
 SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
 SHA256 (golang-crypto-5c72a883971a_GH0.tar.gz) = 2b8df0754ba64c95786bc5fe2071cadf4757f754e774f5985d725c1aaa6cb3d8
@@ -75,6 +85,8 @@ SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6e
 SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
 SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88806c90712a4b66013b20a1ff0562eae
 SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058
+SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
+SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428
 SHA256 (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 89d8aa45b05c9cd5e66c40a5c4f3a5224dbf9632d1fd1e27d05f2ad26effae32
 SIZE (jcmturner-aescts-v1.0.1_GH0.tar.gz) = 7311
 SHA256 (jcmturner-dnsutils-v1.0.1_GH0.tar.gz) = 9781a79a5b46e6ad245d238d1be1b37d8eab9ca9e57edb575ef0af158adeeefb
@@ -89,8 +101,8 @@ SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) =
 SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408
 SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e
 SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083
-SHA256 (libgit2-git2go-v30.0.5_GH0.tar.gz) = 114d374b81f8d6d342b3a426ee778e8836db4f3e9d002c26083c2b9576a1a973
-SIZE (libgit2-git2go-v30.0.5_GH0.tar.gz) = 85156
+SHA256 (libgit2-git2go-v30.0.18_GH0.tar.gz) = d0fa2ebc485751d30d06d01b22e3f66e74faf3a122311c2ebbd16f4fa8306829
+SIZE (libgit2-git2go-v30.0.18_GH0.tar.gz) = 92811
 SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14
 SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986
 SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
@@ -105,14 +117,16 @@ SHA256 (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 07
 SIZE (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 18831
 SHA256 (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = e773762d9adb136c048e20f75f90ed3da9c4fd670c1798d26ef592b9aa4e44c7
 SIZE (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = 3173
+SHA256 (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 0933a1ba6e418fe020993e80426107da8de3572f3f20b4cd1ef296de6e62bb61
+SIZE (opencontainers-runtime-spec-v1.0.2_GH0.tar.gz) = 71840
 SHA256 (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = cb32b383422a9aae11d260657d52a3789bd799802881b9ced3ee82c370be6f76
 SIZE (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = 35914
 SHA256 (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 837b8407fb401deff36961ce32498a1145c5ef4bad0b0060a25e632c14621941
 SIZE (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 98819
 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff
 SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662
@@ -143,9 +157,9 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b
 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
-SHA256 (gitlab-org-gitaly-a316b208ee7a725c06d0abe34172d0920932413f_GL0.tar.gz) = e9ee1d52ea5273f8f92158e9b2c56f8ea78233da49f83e5219ccad7aa5ddeed3
-SIZE (gitlab-org-gitaly-a316b208ee7a725c06d0abe34172d0920932413f_GL0.tar.gz) = 3219024
+SHA256 (gitlab-org-gitaly-6c9022b6b7bc7abb440abde9fededc82db213c3c_GL0.tar.gz) = 61eba78b52872d0f3fa635077571571b27cebca3e3812716598933efcdba6b5f
+SIZE (gitlab-org-gitaly-6c9022b6b7bc7abb440abde9fededc82db213c3c_GL0.tar.gz) = 3286989
 SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3
 SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583
-SHA256 (gitlab-org-labkit-40dcf811328cfe956de0d89ed9276a9d4f35eddd_GL0.tar.gz) = 21c2f89ff924a28f0783c69d33f0de2ef023e8d5271bbe8672354c4041381a3d
-SIZE (gitlab-org-labkit-40dcf811328cfe956de0d89ed9276a9d4f35eddd_GL0.tar.gz) = 71311
+SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd
+SIZE (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 141565

Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist	Tue Dec 22 16:26:29 2020	(r558915)
+++ head/devel/gitaly/pkg-plist	Tue Dec 22 16:34:09 2020	(r558916)
@@ -122,7 +122,6 @@
 %%DATADIR%%/ruby/spec/lib/gitaly_server/utils_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitaly_server/sentry_interceptor_spec.rb
-%%DATADIR%%/ruby/spec/lib/gitlab/config_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/blob_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/branch_spec.rb
 %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_patches_spec.rb
@@ -156,7 +155,6 @@
 %%DATADIR%%/ruby/spec/support/generate-seed-repo-rb
 %%DATADIR%%/ruby/spec/support/helpers/certs/gitalycert.pem
 %%DATADIR%%/ruby/spec/support/helpers/certs/gitalykey.pem
-%%DATADIR%%/ruby/spec/support/helpers/gitlab_shell_helper.rb
 %%DATADIR%%/ruby/spec/support/helpers/integration_helper.rb
 %%DATADIR%%/ruby/spec/support/helpers/seed_repo.rb
 %%DATADIR%%/ruby/spec/support/helpers/testdata/home/.gitconfig



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