Date: Wed, 3 Mar 2021 09:26:35 +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: r567035 - in head/devel/gitaly: . files Message-ID: <202103030926.1239QZN9014082@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Wed Mar 3 09:26:35 2021 New Revision: 567035 URL: https://svnweb.freebsd.org/changeset/ports/567035 Log: Update to 13.9.1 which is required for gitlab-ce upgrade. Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-Makefile head/devel/gitaly/files/patch-ruby_Gemfile Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Wed Mar 3 09:25:38 2021 (r567034) +++ head/devel/gitaly/Makefile Wed Mar 3 09:26:35 2021 (r567035) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.8.4 +DISTVERSION= 13.9.1 PORTREVISION= 0 CATEGORIES= devel @@ -14,19 +14,19 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.29:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ - rubygem-rugged>=0.28:devel/rubygem-rugged \ + rubygem-rugged>=1.0.1<1.1: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.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 \ + rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.1<4.2.8:www/rubygem-gitlab-gollum-lib \ + rubygem-gitlab-gollum-rugged_adapter>=0.4.4.3.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \ 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.15:devel/rubygem-gitlab-labkit \ - rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \ + rubygem-gitlab-labkit>=0.15.0<0.16:devel/rubygem-gitlab-labkit \ + rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ rubygem-google-protobuf>=3.12.0<4:devel/rubygem-google-protobuf BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ @@ -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= d55841b9552e1e0d4fa20c46d89dde5dcd1c7bd7 +GL_COMMIT= 4f85f046841f2fbfcf8db5d54f7957aa60977b62 # for go dependencies USE_GITHUB= nodefault @@ -89,7 +89,7 @@ GH_TUPLE= \ 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.2.2:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ + grpc-ecosystem:go-grpc-middleware:be4c235f9d1c: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.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 \ Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Wed Mar 3 09:25:38 2021 (r567034) +++ head/devel/gitaly/distinfo Wed Mar 3 09:26:35 2021 (r567035) @@ -1,4 +1,4 @@ -TIMESTAMP = 1613117098 +TIMESTAMP = 1614351635 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 @@ -77,8 +77,8 @@ 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.2.2_GH0.tar.gz) = 58ace93df5406bb6f1e3e5d49f72f916f99ad6fe0c63cd4dacc6017dbdf7ef76 -SIZE (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 99696 +SHA256 (grpc-ecosystem-go-grpc-middleware-be4c235f9d1c_GH0.tar.gz) = 1316c500919bee1c0064908aeec3395c50683dea8e47adcc6663b7a04cdc984e +SIZE (grpc-ecosystem-go-grpc-middleware-be4c235f9d1c_GH0.tar.gz) = 101217 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.29.1_GH0.tar.gz) = b626c128878d1d7aaf79c6f4f73cba0eadd26405a30fc00b71cc9a12e56fef38 @@ -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-d55841b9552e1e0d4fa20c46d89dde5dcd1c7bd7_GL0.tar.gz) = e60ef20a279fb289ec4ef974ba465dca1fd60af008eb169ec747d9275f34f4c0 -SIZE (gitlab-org-gitaly-d55841b9552e1e0d4fa20c46d89dde5dcd1c7bd7_GL0.tar.gz) = 3308195 +SHA256 (gitlab-org-gitaly-4f85f046841f2fbfcf8db5d54f7957aa60977b62_GL0.tar.gz) = c773ea0c94c888cd94878a014b41da521a4126edc4a498aa214e9277e7466e1e +SIZE (gitlab-org-gitaly-4f85f046841f2fbfcf8db5d54f7957aa60977b62_GL0.tar.gz) = 3353539 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 Mar 3 09:25:38 2021 (r567034) +++ head/devel/gitaly/files/patch-Makefile Wed Mar 3 09:26:35 2021 (r567035) @@ -1,7 +1,7 @@ ---- Makefile.orig 2021-01-21 14:54:05 UTC +--- Makefile.orig 2021-02-19 09:28:00 UTC +++ Makefile -@@ -48,7 +48,7 @@ GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertur - GOLANGCI_LINT_OPTIONS ?= +@@ -49,7 +49,7 @@ GOLANGCI_LINT_OPTIONS ?= + GOLANGCI_LINT_CONFIG ?= ${SOURCE_DIR}/.golangci.yml # 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) -@@ -173,7 +173,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} +@@ -174,7 +174,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 -@@ -211,7 +211,7 @@ assemble-ruby: +@@ -212,7 +212,7 @@ assemble-ruby: .PHONY: binaries binaries: assemble ${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi @@ -26,8 +26,8 @@ + ${Q}cd ${ASSEMBLY_ROOT} && sha256 bin/* | tee checksums.sha256.txt .PHONY: prepare-tests - prepare-tests: git ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle -@@ -372,8 +372,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a + prepare-tests: git libgit2 prepare-test-repos ${SOURCE_DIR}/.ruby-bundle +@@ -374,8 +374,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 -@@ -403,17 +402,17 @@ ${BUILD_DIR}/go.mod: | ${BUILD_DIR} +@@ -405,17 +404,17 @@ ${BUILD_DIR}/tools: | ${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 Mar 3 09:25:38 2021 (r567034) +++ head/devel/gitaly/files/patch-ruby_Gemfile Wed Mar 3 09:26:35 2021 (r567035) @@ -1,23 +1,6 @@ ---- ruby/Gemfile.orig 2021-01-21 14:54:05 UTC +--- ruby/Gemfile.orig 2021-02-19 09:28:00 UTC +++ ruby/Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rugged', '~> 0.28' -+gem 'rugged', '~> 1.0' - gem 'github-linguist', '~> 7.12', require: 'linguist' - gem 'gitlab-markup', '~> 1.7.1' - 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' +@@ -21,13 +21,3 @@ gem 'licensee', '~> 9.14.1' gem 'google-protobuf', '~> 3.12'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103030926.1239QZN9014082>