svn commit: r563050 - in head/devel/gitaly: . files
Matthias Fechner
mfechner at FreeBSD.org
Wed Jan 27 12:34:22 UTC 2021
Author: mfechner
Date: Wed Jan 27 12:34:21 2021
New Revision: 563050
URL: https://svnweb.freebsd.org/changeset/ports/563050
Log:
Update to 13.8.0 which is required for gitlab-ce 13.8.
Modified:
head/devel/gitaly/Makefile
head/devel/gitaly/distinfo
head/devel/gitaly/files/patch-Makefile
head/devel/gitaly/files/patch-ruby_Gemfile
head/devel/gitaly/pkg-plist
Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile Wed Jan 27 12:33:21 2021 (r563049)
+++ head/devel/gitaly/Makefile Wed Jan 27 12:34:21 2021 (r563050)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitaly
-DISTVERSION= 13.7.4
+DISTVERSION= 13.8.0
PORTREVISION= 0
CATEGORIES= devel
@@ -17,7 +17,7 @@ MY_DEPENDS= git>=2.29:devel/git \
rubygem-rugged>=0.28:devel/rubygem-rugged \
rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \
- rubygem-activesupport60>=6.0.3.3<6.0.4:devel/rubygem-activesupport60 \
+ rubygem-activesupport60>=6.0.3.4<6.0.4:devel/rubygem-activesupport60 \
rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.9<4.2.8:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
@@ -25,7 +25,7 @@ MY_DEPENDS= git>=2.29:devel/git \
rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \
rubygem-faraday>=1.0.1<2:www/rubygem-faraday \
rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \
- rubygem-gitlab-labkit>=0.13.2<0.14:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.13.2<0.15:devel/rubygem-gitlab-labkit \
rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
rubygem-google-protobuf>=3.12.0<4:devel/rubygem-google-protobuf
BUILD_DEPENDS= gem:devel/ruby-gems \
@@ -43,7 +43,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
-GL_COMMIT= 59d41cd9c0da11578acc792126e83de23fae796b
+GL_COMMIT= 8b2db6c8d1f035a15667aa708e00a3f7fd482f14
# for go dependencies
USE_GITHUB= nodefault
@@ -70,8 +70,7 @@ GH_TUPLE= \
git-lfs:go-ntlm:c5056e7fa066:git_lfs_go_ntlm/vendor/github.com/git-lfs/go-ntlm \
git-lfs:wildmatch:v1.0.4:git_lfs_wildmatch/vendor/github.com/git-lfs/wildmatch \
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 \
+ go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
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 \
@@ -79,19 +78,20 @@ GH_TUPLE= \
golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \
golang:net:62affa334b73:golang_net/vendor/golang.org/x/net \
golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
- golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+ golang:protobuf:v1.3.3:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sync:6e8e738ad208:golang_sync/vendor/golang.org/x/sync \
golang:sys:e3ed0017c211:golang_sys/vendor/golang.org/x/sys \
golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
- google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \
+ google:go-cmp:v0.4.0:google_go_cmp/vendor/github.com/google/go-cmp \
+ google:go-genproto:7949de9c1215:google_go_genproto/vendor/google.golang.org/genproto \
google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \
google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
googleapis:google-cloud-go:v0.50.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
- grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
+ grpc-ecosystem:go-grpc-middleware:v1.2.2:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \
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 \
+ grpc:grpc-go:v1.29.1: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 \
Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo Wed Jan 27 12:33:21 2021 (r563049)
+++ head/devel/gitaly/distinfo Wed Jan 27 12:34:21 2021 (r563050)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1610623978
+TIMESTAMP = 1611265285
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
@@ -41,8 +41,6 @@ SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4b
SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726
SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
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
@@ -57,16 +55,18 @@ SHA256 (golang-net-62affa334b73_GH0.tar.gz) = abc8bc76
SIZE (golang-net-62affa334b73_GH0.tar.gz) = 1179195
SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
-SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
-SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-protobuf-v1.3.3_GH0.tar.gz) = b3a1440808d6ed4dc0d194c482de029f6c116b1de7f7a3bf927324d965ff3853
+SIZE (golang-protobuf-v1.3.3_GH0.tar.gz) = 315377
SHA256 (golang-sync-6e8e738ad208_GH0.tar.gz) = 011eb5dc95a0ede8be5d68edde93be5af1b88d7fc098d0f74c6f7560beb378f0
SIZE (golang-sync-6e8e738ad208_GH0.tar.gz) = 17288
SHA256 (golang-sys-e3ed0017c211_GH0.tar.gz) = 93c78dbd2d42098a1d6cbe483c5564d59d5a6eff470295aba1a1f6adf495d5e1
SIZE (golang-sys-e3ed0017c211_GH0.tar.gz) = 1068415
SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
-SHA256 (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 06778b867759fad0b06fac4067911e616184aa40061cbd37cffaa950399ad7d4
-SIZE (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 5960232
+SHA256 (google-go-cmp-v0.4.0_GH0.tar.gz) = 97964b47aa6dc61007f9e1b1ad67812f0a8a2380072a59daebac7bc0cdcf740a
+SIZE (google-go-cmp-v0.4.0_GH0.tar.gz) = 81600
+SHA256 (google-go-genproto-7949de9c1215_GH0.tar.gz) = a89e3dc49016b3bc24360b543070e17a429aabdf38a7baa0415846a12319dabb
+SIZE (google-go-genproto-7949de9c1215_GH0.tar.gz) = 7836770
SHA256 (google-pprof-d4f498aebedc_GH0.tar.gz) = 996b1f210183d8541a3a3cf22a2045396e4473cb92123c1b13613c0726a7bb76
SIZE (google-pprof-d4f498aebedc_GH0.tar.gz) = 1145078
SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
@@ -77,12 +77,12 @@ SHA256 (googleapis-google-api-go-client-v0.15.0_GH0.ta
SIZE (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 13259795
SHA256 (googleapis-google-cloud-go-v0.50.0_GH0.tar.gz) = 8227c310b0059f9b1eb2ca16e9cebb3550272b929aaa1de7039a47d353ab8a18
SIZE (googleapis-google-cloud-go-v0.50.0_GH0.tar.gz) = 2410793
-SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b
-SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266
+SHA256 (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 58ace93df5406bb6f1e3e5d49f72f916f99ad6fe0c63cd4dacc6017dbdf7ef76
+SIZE (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 99696
SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9
SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760
-SHA256 (grpc-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b
-SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074
+SHA256 (grpc-grpc-go-v1.29.1_GH0.tar.gz) = b626c128878d1d7aaf79c6f4f73cba0eadd26405a30fc00b71cc9a12e56fef38
+SIZE (grpc-grpc-go-v1.29.1_GH0.tar.gz) = 892944
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
@@ -157,8 +157,8 @@ 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-59d41cd9c0da11578acc792126e83de23fae796b_GL0.tar.gz) = c33948dc574b7863912d80df1c9b7fd01a08dfb4671d38c8dda1b27776f610f9
-SIZE (gitlab-org-gitaly-59d41cd9c0da11578acc792126e83de23fae796b_GL0.tar.gz) = 3287000
+SHA256 (gitlab-org-gitaly-8b2db6c8d1f035a15667aa708e00a3f7fd482f14_GL0.tar.gz) = bba5c9439d4d7073e9332e8961593b64f57f214eaf2822b20b34501e9267be4b
+SIZE (gitlab-org-gitaly-8b2db6c8d1f035a15667aa708e00a3f7fd482f14_GL0.tar.gz) = 3308228
SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3
SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583
SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 7fb33d071f1731691125807188be8faba6100a43fa66ad9064d204b56642fbfd
Modified: head/devel/gitaly/files/patch-Makefile
==============================================================================
--- head/devel/gitaly/files/patch-Makefile Wed Jan 27 12:33:21 2021 (r563049)
+++ head/devel/gitaly/files/patch-Makefile Wed Jan 27 12:34:21 2021 (r563050)
@@ -1,7 +1,7 @@
---- Makefile.orig 2020-11-20 11:52:08 UTC
+--- Makefile.orig 2021-01-21 14:54:05 UTC
+++ Makefile
-@@ -45,7 +45,7 @@ GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report
- GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura
+@@ -48,7 +48,7 @@ GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertur
+ GOLANGCI_LINT_OPTIONS ?=
# Build information
-BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment)
@@ -9,7 +9,7 @@
GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly
BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S")
GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown)
-@@ -156,7 +156,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
+@@ -173,7 +173,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR}
all: install
.PHONY: build
@@ -18,7 +18,7 @@
go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
.PHONY: install
-@@ -194,7 +194,7 @@ assemble-ruby:
+@@ -211,7 +211,7 @@ assemble-ruby:
.PHONY: binaries
binaries: assemble
${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi
@@ -27,7 +27,7 @@
.PHONY: prepare-tests
prepare-tests: git ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle
-@@ -349,8 +349,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
+@@ -372,8 +372,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
# step. Both Omnibus and CNG assume it is in the Gitaly root, not in
# _build. Hence the '../' in front.
${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
@@ -37,7 +37,7 @@
${Q}touch $@
${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
-@@ -385,17 +384,17 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR}
+@@ -403,17 +402,17 @@ ${BUILD_DIR}/go.mod: | ${BUILD_DIR}
# jobs of a CI pipeline, we start depending on its hash. Like this, we only
# rebuild if the Makefile actually has changed contents.
${BUILD_DIR}/Makefile.sha256: Makefile | ${BUILD_DIR}
Modified: head/devel/gitaly/files/patch-ruby_Gemfile
==============================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile Wed Jan 27 12:33:21 2021 (r563049)
+++ head/devel/gitaly/files/patch-ruby_Gemfile Wed Jan 27 12:34:21 2021 (r563050)
@@ -1,4 +1,4 @@
---- ruby/Gemfile.orig 2020-12-10 15:14:51 UTC
+--- ruby/Gemfile.orig 2021-01-21 14:54:05 UTC
+++ ruby/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
@@ -7,7 +7,16 @@
+gem 'rugged', '~> 1.0'
gem 'github-linguist', '~> 7.12', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
- gem 'activesupport', '~> 6.0.3.3'
+ gem 'activesupport', '~> 6.0.3.4'
+@@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0'
+ gem 'rbtrace', require: false
+
+ # Labkit provides observability functionality
+-gem 'gitlab-labkit', '~> 0.13.2'
++gem 'gitlab-labkit', '~> 0.13'
+
+ # Detects the open source license the repository includes
+ # This version needs to be in sync with GitLab CE/EE
@@ -21,13 +21,3 @@ gem 'licensee', '~> 8.9.0'
gem 'google-protobuf', '~> 3.12'
Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist Wed Jan 27 12:33:21 2021 (r563049)
+++ head/devel/gitaly/pkg-plist Wed Jan 27 12:34:21 2021 (r563050)
@@ -39,7 +39,6 @@
%%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb
%%DATADIR%%/ruby/lib/gitlab/git/hook.rb
%%DATADIR%%/ruby/lib/gitlab/git/hooks_service.rb
-%%DATADIR%%/ruby/lib/gitlab/git/http_auth.rb
%%DATADIR%%/ruby/lib/gitlab/git/index.rb
%%DATADIR%%/ruby/lib/gitlab/git/lfs_changes.rb
%%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb
More information about the svn-ports-all
mailing list