svn commit: r543223 - in head/devel/gitaly: . files

Matthias Fechner mfechner at FreeBSD.org
Fri Jul 24 09:10:47 UTC 2020 

Author: mfechner
Date: Fri Jul 24 09:10:45 2020
New Revision: 543223
URL: https://svnweb.freebsd.org/changeset/ports/543223

Log:
  Update to 13.2.0 which is required for gitlab-ce 13.2.

Added:
  head/devel/gitaly/files/patch-Makefile   (contents, props changed)
  head/devel/gitaly/files/patch-mr2407   (contents, props changed)
Deleted:
  head/devel/gitaly/files/patch-__support_Makefile.template
  head/devel/gitaly/files/patch-__support_makegen.go
Modified:
  head/devel/gitaly/Makefile
  head/devel/gitaly/distinfo
  head/devel/gitaly/pkg-plist

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Fri Jul 24 07:53:32 2020	(r543222)
+++ head/devel/gitaly/Makefile	Fri Jul 24 09:10:45 2020	(r543223)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	13.1.4
+DISTVERSION=	13.2.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -25,7 +25,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 		rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \
 		rubygem-faraday0>=0.12<1.0:www/rubygem-faraday0 \
 		rubygem-rbtrace>0:devel/rubygem-rbtrace \
-		rubygem-gitlab-labkit>=0.12.0<0.12.1:devel/rubygem-gitlab-labkit \
+		rubygem-gitlab-labkit>=0.12.1<0.13:devel/rubygem-gitlab-labkit \
 		rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
 		rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38
 BUILD_DEPENDS=	gem:devel/ruby-gems \
@@ -42,7 +42,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=	f2fb94486d4bc5102b99960786abe8f85d8ff2fd
+GL_COMMIT=	5934aeb1ab3ddb0f89d6b1edd3089cd311d6c06d
 
 # for go dependencies
 USE_GITHUB=	nodefault

Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo	Fri Jul 24 07:53:32 2020	(r543222)
+++ head/devel/gitaly/distinfo	Fri Jul 24 09:10:45 2020	(r543223)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1594358428
+TIMESTAMP = 1595359220
 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
 SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@@ -99,8 +99,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-f2fb94486d4bc5102b99960786abe8f85d8ff2fd_GL0.tar.gz) = 7e4f074a7f9dec072844fc8c0b6633c6cec82483c41a52e59a353b61fcc5cd4e
-SIZE (gitlab-org-gitaly-f2fb94486d4bc5102b99960786abe8f85d8ff2fd_GL0.tar.gz) = 3024353
+SHA256 (gitlab-org-gitaly-5934aeb1ab3ddb0f89d6b1edd3089cd311d6c06d_GL0.tar.gz) = 09f4dea2df143f89a7b0b9fb19a97cd8b113f9c612221afa0276d1ef7755ce44
+SIZE (gitlab-org-gitaly-5934aeb1ab3ddb0f89d6b1edd3089cd311d6c06d_GL0.tar.gz) = 3063063
 SHA256 (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 9a2a40a6c44802b1de7ff46bc9c6bc97c8be179d0ca4fe755c22044650d3f84c
 SIZE (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 65840
 SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95

Added: head/devel/gitaly/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gitaly/files/patch-Makefile	Fri Jul 24 09:10:45 2020	(r543223)
@@ -0,0 +1,21 @@
+--- Makefile.orig	2020-07-22 11:23:09 UTC
++++ Makefile
+@@ -44,7 +44,7 @@ PROTOC_GEN_GITALY := ${BUILD_DIR}/bin/protoc-gen-gital
+ GO_JUNIT_REPORT   := ${BUILD_DIR}/bin/go-junit-report
+ 
+ # Build information
+-BUNDLE_FLAGS    ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment)
++BUNDLE_FLAGS    ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --local)
+ 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)
+@@ -317,8 +317,7 @@ build-git:
+ # 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
+-	${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging
+-	${Q}cd ${GITALY_RUBY_DIR} && bundle install ${BUNDLE_FLAGS}
++	${Q}cd ${GITALY_RUBY_DIR} && rm -f Gemfile.lock && bundle install ${BUNDLE_FLAGS}
+ 	${Q}touch $@
+ 
+ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE

Added: head/devel/gitaly/files/patch-mr2407
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gitaly/files/patch-mr2407	Fri Jul 24 09:10:45 2020	(r543223)
@@ -0,0 +1,45 @@
+--- Makefile.orig	2020-07-21 14:44:09 UTC
++++ Makefile
+@@ -62,17 +62,10 @@ GIT_VERSION           ?= v2.27.0
+ ifeq (${OS},Darwin)
+     PROTOC_URL            ?= https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-osx-x86_64.zip
+     PROTOC_HASH           ?= 0decc6ce5beed07f8c20361ddeb5ac7666f09cf34572cca530e16814093f9c0c
+-    GOLANGCI_LINT_ARCHIVE ?= golangci-lint-${GOLANGCI_LINT_VERSION}-darwin-amd64
+-    GOLANGCI_LINT_HASH    ?= 3fb1a1683a29c6c0a8cd76135f62b606fbdd538d5a7aeab94af1af70ffdc2fd4
+ else ifeq (${OS},Linux)
+     PROTOC_URL            ?= https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip
+     PROTOC_HASH           ?= 6003de742ea3fcf703cfec1cd4a3380fd143081a2eb0e559065563496af27807
+-    GOLANGCI_LINT_ARCHIVE ?= golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64
+-    GOLANGCI_LINT_HASH    ?= 8d345e4e88520e21c113d81978e89ad77fc5b13bfdf20e5bca86b83fc4261272
+-else
+-    $(error Unsupported OS: ${OS})
+ endif
+-GOLANGCI_LINT_URL ?= https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/${GOLANGCI_LINT_ARCHIVE}.tar.gz
+ 
+ # Git target
+ GIT_REPO_URL      ?= https://gitlab.com/gitlab-org/gitlab-git.git
+@@ -351,6 +344,7 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR}
+ 	cd ${BUILD_DIR}/protoc && unzip ${BUILD_DIR}/protoc.zip
+ 
+ ${BUILD_DIR}/protoc.zip: | ${BUILD_DIR}
++	${Q}if [ -z "${PROTOC_URL}" ]; then echo "Cannot generate protos on unsupported platform ${OS}" && exit 1; fi
+ 	curl -o $@.tmp --silent --show-error -L ${PROTOC_URL}
+ 	${Q}printf '${PROTOC_HASH}  $@.tmp' | shasum -a256 -c -
+ 	${Q}mv $@.tmp $@
+@@ -378,14 +372,8 @@ ${PROTOC_GEN_GO}: ${BUILD_DIR}/go.mod | ${BUILD_DIR}/b
+ ${PROTOC_GEN_GITALY}: ${BUILD_DIR}/go.mod proto-lint | ${BUILD_DIR}/bin
+ 	${Q}go build -o $@ gitlab.com/gitlab-org/gitaly/proto/go/internal/cmd/protoc-gen-gitaly
+ 
+-${GOLANGCI_LINT}: ${BUILD_DIR}/golangci-lint.tar.gz | ${BUILD_DIR}/bin
+-	${Q}tar -x -z --strip-components 1 -C ${BUILD_DIR}/bin -f ${BUILD_DIR}/golangci-lint.tar.gz ${GOLANGCI_LINT_ARCHIVE}/golangci-lint
+-	touch $@
+-
+-${BUILD_DIR}/golangci-lint.tar.gz: | ${BUILD_DIR}
+-	curl -o $@.tmp --silent --show-error -L ${GOLANGCI_LINT_URL}
+-	${Q}printf '${GOLANGCI_LINT_HASH}  $@.tmp' | shasum -a256 -c -
+-	${Q}mv $@.tmp $@
++${GOLANGCI_LINT}: ${BUILD_DIR}/go.mod | ${BUILD_DIR}/bin
++	${Q}cd ${BUILD_DIR} && go get github.com/golangci/golangci-lint/cmd/golangci-lint at v${GOLANGCI_LINT_VERSION}
+ 
+ ${TEST_REPO}:
+ 	git clone --bare --quiet https://gitlab.com/gitlab-org/gitlab-test.git $@

Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist	Fri Jul 24 07:53:32 2020	(r543222)
+++ head/devel/gitaly/pkg-plist	Fri Jul 24 09:10:45 2020	(r543223)
@@ -135,6 +135,7 @@
 %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb
 %%DATADIR%%/ruby/lib/gitlab/ref_matcher.rb
 %%DATADIR%%/ruby/lib/gitlab/utils/strong_memoize.rb
+%%DATADIR%%/ruby/lib/praefect/transaction.rb
 %%DATADIR%%/ruby/proto/README.md
 %%DATADIR%%/ruby/proto/gitaly.rb
 %%DATADIR%%/ruby/proto/gitaly/blob_pb.rb

More information about the svn-ports-all mailing list