Date: Sat, 26 Sep 2020 07:25:51 +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: r550112 - in head/devel/gitaly: . files Message-ID: <202009260725.08Q7Pp04090800@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sat Sep 26 07:25:50 2020 New Revision: 550112 URL: https://svnweb.freebsd.org/changeset/ports/550112 Log: Update to gitaly 13.4 which is required for gitlab-ce 13.4. This commit also includes the MR to be able to compile against to standard libgit2 port: https://gitlab.com/gitlab-org/gitaly/-/merge_requests/2600 Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-Makefile head/devel/gitaly/files/patch-config.toml.example head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Sat Sep 26 07:23:55 2020 (r550111) +++ head/devel/gitaly/Makefile Sat Sep 26 07:25:50 2020 (r550112) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.3.6 +DISTVERSION= 13.4.0 PORTREVISION= 0 CATEGORIES= devel @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.26:devel/git \ +MY_DEPENDS= git>=2.28:devel/git \ rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ rubygem-rugged>=0.28:devel/rubygem-rugged \ rubygem-github-linguist>=7.9<8.0:textproc/rubygem-github-linguist \ @@ -22,9 +22,9 @@ MY_DEPENDS= git>=2.26:devel/git \ 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-grpc124>=1.24.0:net/rubygem-grpc124 \ - 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-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.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 @@ -33,8 +33,9 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ gitlab-shell>=9.3.0:devel/gitlab-shell +LIB_DEPENDS= libgit2.so:devel/libgit2 -USES= gmake go:modules,no_targets +USES= gmake go:modules,no_targets pkgconfig USE_RUBY= yes MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" @@ -42,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= 54aae4d2724f498eb663a0bc673fcabd9fa04f97 +GL_COMMIT= cf359cb573106371a6026bd85c3145caabf8c06b # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 54dd +# 55dd GH_TUPLE= \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ @@ -67,7 +68,7 @@ GH_TUPLE= \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ + 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:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ @@ -80,6 +81,7 @@ GH_TUPLE= \ kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ 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 \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ @@ -100,8 +102,8 @@ GH_TUPLE= \ uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib -GL_TUPLE= gitlab-org:gitlab-shell:716e30c55e893ebe2385b27f85902a789f26c6ef:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ - gitlab-org:labkit:0149780c759d60f61fcfe1648fb882ba7ec41f3f:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit +GL_TUPLE= gitlab-org:gitlab-shell:82ec8144fb2a04d78f29ae5d1f4e5a407257309f:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ + gitlab-org:labkit:45895e1290291a2519678a847a24edb22880b9e6: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 Sat Sep 26 07:23:55 2020 (r550111) +++ head/devel/gitaly/distinfo Sat Sep 26 07:25:50 2020 (r550112) @@ -1,4 +1,4 @@ -TIMESTAMP = 1600178353 +TIMESTAMP = 1600792765 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 @@ -35,8 +35,8 @@ SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956 SHA256 (golang-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49 SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522 -SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 -SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 +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-pprof-d4f498aebedc_GH0.tar.gz) = 996b1f210183d8541a3a3cf22a2045396e4473cb92123c1b13613c0726a7bb76 @@ -61,6 +61,8 @@ SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2 SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987 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 (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-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe @@ -99,9 +101,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-54aae4d2724f498eb663a0bc673fcabd9fa04f97_GL0.tar.gz) = a95489653aa1288877657ddea99d1c694a76429a2b4b508edfe735c5ea342b9a -SIZE (gitlab-org-gitaly-54aae4d2724f498eb663a0bc673fcabd9fa04f97_GL0.tar.gz) = 3099813 -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 -SIZE (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = 3671144 +SHA256 (gitlab-org-gitaly-cf359cb573106371a6026bd85c3145caabf8c06b_GL0.tar.gz) = f723bbab064776b3da1398f64f3c7ddc717c5e3db07a27e05e8ee9d079b93eb6 +SIZE (gitlab-org-gitaly-cf359cb573106371a6026bd85c3145caabf8c06b_GL0.tar.gz) = 3134434 +SHA256 (gitlab-org-gitlab-shell-82ec8144fb2a04d78f29ae5d1f4e5a407257309f_GL0.tar.gz) = f2cf085e3ce5f5b36efe70270a523c30eac56b61443d61786130082a136457e6 +SIZE (gitlab-org-gitlab-shell-82ec8144fb2a04d78f29ae5d1f4e5a407257309f_GL0.tar.gz) = 82364 +SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011 +SIZE (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 66930 Modified: head/devel/gitaly/files/patch-Makefile ============================================================================== --- head/devel/gitaly/files/patch-Makefile Sat Sep 26 07:23:55 2020 (r550111) +++ head/devel/gitaly/files/patch-Makefile Sat Sep 26 07:25:50 2020 (r550112) @@ -1,7 +1,7 @@ ---- Makefile.orig 2020-08-21 11:51:41 UTC +--- Makefile.orig 2020-09-21 16:21:08 UTC +++ Makefile -@@ -44,7 +44,7 @@ PROTOC_GEN_GITALY := ${BUILD_DIR}/bin/protoc-gen-gital - GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report +@@ -46,7 +46,7 @@ GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report + GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura # Build information -BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment) @@ -9,7 +9,36 @@ 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) -@@ -316,8 +316,7 @@ build-git: +@@ -147,7 +147,10 @@ export GOPROXY ?= https://proxy.gola + export PATH := ${BUILD_DIR}/bin:${PATH} + export PKG_CONFIG_PATH := ${LIBGIT2_INSTALL_DIR}/lib/pkgconfig + export GITALY_TESTING_GIT_BINARY ?= ${GIT_INSTALL_DIR}/bin/git ++# Whiteliste the linker flag -D_THREAD_SAFE as libgit2 is compiled with it ++export CGO_LDFLAGS_ALLOW=-D_THREAD_SAFE + ++ + .NOTPARALLEL: + + .PHONY: all +@@ -155,7 +158,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} + all: install + + .PHONY: build +-build: ${SOURCE_DIR}/.ruby-bundle libgit2 ++build: ${SOURCE_DIR}/.ruby-bundle + go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands)) + + .PHONY: install +@@ -193,7 +196,7 @@ assemble-ruby: + .PHONY: binaries + binaries: assemble + ${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi +- ${Q}cd ${ASSEMBLY_ROOT} && sha256sum bin/* | tee checksums.sha256.txt ++ ${Q}cd ${ASSEMBLY_ROOT} && sha256 bin/* | tee checksums.sha256.txt + + .PHONY: prepare-tests + prepare-tests: git ${GITLAB_SHELL_DIR}/config.yml ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle +@@ -349,8 +352,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 @@ -19,3 +48,24 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE +@@ -380,17 +382,17 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${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} +- ${Q}sha256sum -c $@ >/dev/null 2>&1 || >$@ sha256sum Makefile ++ ${Q}sha256 -c $@ >/dev/null 2>&1 || >$@ sha256 Makefile + + ${BUILD_DIR}/protoc.zip: ${BUILD_DIR}/Makefile.sha256 + ${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' | sha256sum -c - ++ ${Q}printf '${PROTOC_HASH} $@.tmp' | sha256 -c - + ${Q}mv $@.tmp $@ + + ${BUILD_DIR}/git_full_bins.tgz: ${BUILD_DIR}/Makefile.sha256 + curl -o $@.tmp --silent --show-error -L ${GIT_BINARIES_URL} +- ${Q}printf '${GIT_BINARIES_HASH} $@.tmp' | sha256sum -c - ++ ${Q}printf '${GIT_BINARIES_HASH} $@.tmp' | sha256 -c - + ${Q}mv $@.tmp $@ + + ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${BUILD_DIR}/Makefile.sha256 Modified: head/devel/gitaly/files/patch-config.toml.example ============================================================================== --- head/devel/gitaly/files/patch-config.toml.example Sat Sep 26 07:23:55 2020 (r550111) +++ head/devel/gitaly/files/patch-config.toml.example Sat Sep 26 07:25:50 2020 (r550112) @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2020-06-19 15:55:37 UTC +--- config.toml.example.orig 2020-09-21 16:21:08 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and @@ -64,6 +64,6 @@ -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" +secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" - - [gitlab.http-settings] - # read_timeout = 300 + # Only needed if a UNIX socket is used in `url` and GitLab is configured to + # use a relative path (e.g. /gitlab). + # relative_url_root = '/' Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Sat Sep 26 07:23:55 2020 (r550111) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sat Sep 26 07:25:50 2020 (r550112) @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2020-08-21 11:51:41 UTC +--- ruby/Gemfile.orig 2020-09-21 16:21:08 UTC +++ ruby/Gemfile @@ -3,14 +3,14 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 @@ -14,8 +14,8 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.30.2' +gem 'grpc', '~> 1.24.0' - gem 'sentry-raven', '~> 2.9.0', require: false - gem 'faraday', '~> 0.12' + gem 'sentry-raven', '~> 3.0', require: false + gem 'faraday', '~> 1.0' gem 'rbtrace', require: false @@ -22,21 +22,5 @@ gem 'gitlab-labkit', '~> 0.12.0' # This version needs to be in sync with GitLab CE/EE Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Sat Sep 26 07:23:55 2020 (r550111) +++ head/devel/gitaly/pkg-plist Sat Sep 26 07:25:50 2020 (r550112) @@ -6,6 +6,7 @@ %%DATADIR%%/ruby/.rubocop_todo.yml %%DATADIR%%/ruby/git-hooks/post-receive %%DATADIR%%/ruby/git-hooks/pre-receive +%%DATADIR%%/ruby/git-hooks/reference-transaction %%DATADIR%%/ruby/git-hooks/update %%DATADIR%%/ruby/gitlab-shell/.codeclimate.yml %%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml @@ -238,6 +239,7 @@ @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-blackbox @(,,555) %%DATADIR%%/bin/gitaly-debug +@(,,555) %%DATADIR%%/bin/gitaly-git2go @(,,555) %%DATADIR%%/bin/gitaly-hooks @(,,555) %%DATADIR%%/bin/gitaly-ssh @(,,555) %%DATADIR%%/bin/gitaly-wrapper
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009260725.08Q7Pp04090800>