From nobody Sat Mar 26 07:45:20 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 029091A45D4E; Sat, 26 Mar 2022 07:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQWG92zVXz3ksp; Sat, 26 Mar 2022 07:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648280721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vvuo4K1X/zPLazURKyTJQLn0itN57gtHWEG6CIViEX8=; b=NRC8hfsv57Qu3rIgxK2aC/cNb9KSrfZ+KGWqAgCM5LVDnTWhSa4eDrjOV4OH/V8TiOuMbN COu2GV05dE+SgPKlQDqgs0nYVQhhe21B0bslj0p3ZHR72r16O8Xr69/AZFIM0/aBcBSRAs dTHJKvsGIcelpIRaC9HAIgY1nOHQMCpWsVMHrRss+Z/CZNQC4GIZMaMnp2ElrnUnrEu8ED mmav5bdBuZ+sCxu52C+wTTx2zeRYFOWozXEobsnr1/Bz8hQXn3fCOSLruBZpJfvyETPNQJ dOkepYSwjqPNvVtmDFLvpSeFVjsR/9pspEb0spOwzV3G8BXSz06TPA+X5yW6FQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A216A1CE57; Sat, 26 Mar 2022 07:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22Q7jKgI088131; Sat, 26 Mar 2022 07:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22Q7jK98088130; Sat, 26 Mar 2022 07:45:20 GMT (envelope-from git) Date: Sat, 26 Mar 2022 07:45:20 GMT Message-Id: <202203260745.22Q7jK98088130@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 83b70cb07f6c - main - devel/gitaly: update to 14.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83b70cb07f6cf361fe7dcf874a3f899cfed14f85 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648280721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vvuo4K1X/zPLazURKyTJQLn0itN57gtHWEG6CIViEX8=; b=cRdFLf+Y8hl3Ba1JC0kE0odOqJKm0+TtemhepLcDWijw/GacMLHNNMcvm4RMBp9oP5bYts FPw6rhcLlUuTHuQpqNYu7yzU6MetUcDw2AD0jhSW7XT2aPUXoKQPTktfrUUvs3SD9OdjfW 0zTkZEkAFQTcHtp2T347CJa4woBaAAB+S10b5LtTwv3f4SG6kZ2cpIRO1BQTFbS2+DjLVD lIVLYAC0e14ytpVkroNRIqoVTJ5WBUOa9kpQrPAAxjHDWsHF+1JJsj4IayX7AZT64T8IhJ 75ij2M9qB8llh9RA8rfGBkb8jMY3zIb8Q6oO7ipWGXCpYhA9LDEX2OgZGLenmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648280721; a=rsa-sha256; cv=none; b=EI90KA9wkyi8G1KgbtjupHiisSVyAJuToG3g9JYdgNT6y3O0AnpOoFEDUhvjNsZXiXyB4o 4H9m27T8mFKHNzofeckCKLEIlWxo2Ujd8Zp2GRfBt3rSCtyDOMT8eca+kZiDljAsHtWkHn MMUsS0IYlZikC1Hv36c5AcAvaw0prRjbd0Sfk1l6u9mDt9VbXXpEzQlF4EYZ89a3tra+Es bNEVIGUT8L2qQSP9HpE3lPU8wJTW9IyCcGr5hbUcumZ+9o1F/6z9e/Zfb0PeQXROpMZpcb 98bZbxcpHAlLwxegiEYNjMNbLb5a6itbzKgmFI40+7S+Ru8Tp6OSvFRhLyrQ7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=83b70cb07f6cf361fe7dcf874a3f899cfed14f85 commit 83b70cb07f6cf361fe7dcf874a3f899cfed14f85 Author: Matthias Fechner AuthorDate: 2022-03-25 14:19:56 +0000 Commit: Matthias Fechner CommitDate: 2022-03-26 07:44:04 +0000 devel/gitaly: update to 14.9.0 Required for gitlab-ce 14.9 Changelog: https://gitlab.com/gitlab-org/gitaly/-/blob/master/CHANGELOG.md 14.9.0 (2022-03-21) Added (7 changes) Repository: allow opting for --mirror for CreateRepositoryFromURL (merge request) housekeeping: Track what kind of repacks OptimizeRepository does (merge request) housekeeping: Expose pruned stale files via Prometheus metric (merge request) proto: Add structured error types for UserRebaseCofirmable (merge request) git2go: Add squash parameter to MergeCommand by @trakos (merge request) git: Support bundled Git v2.35.1.gl1 (merge request) proto: Add structured error types for UserSquash RPC (merge request) Fixed (14 changes) housekeeping: Don't prune recent objects (merge request) repository: Fix indeterministic voting when creating new repos (merge request) operations: Fix wrong error code when UserSquash conflicts (merge request) cgroups: Remove paths field (merge request) Extend invalid metadata deletion logic to repos existin on target (merge request) localrepo: Unlock symbolic refs when the update fails (merge request) git: Verify that bundled Git binaries exist and are executable (merge request) git: Reject config with bundled Git and missing binary directories (merge request) praefect: Pass feature flags to Gitaly when executing ServerInfo (merge request) Hooks: eagerly delete sidechannel socket dir (merge request) Handle backchannel connection closing idempotently (merge request) repository: Fix indetermenistic voting order in ReplicateRepository (merge request) gitaly: Fix missing housekeeping manager dependency (merge request) repository: Ignore missing refs in CreateBundleFromRefList (merge request) Changed (10 changes) housekeeping: Generalize counter for pruned empty directories (merge request) repository: Allow CreateRepository to take default_branch (merge request) operations: Return error from UserSquash when merging fails (merge request) operations: Return error from UserSquash on conflict (merge request) operations: Return error from UserSquash when resolving revisions fails (merge request) git: Enable use of bundled Git by default (merge request) localrepo: Remove flag to switch to sidechannels for internal fetches (merge request) localrepo: Do transactional vote in SetDefaultBranch (merge request) repository: Use optional auth token for cloning (merge request) log: Disable gRPC HealthCheck message logging (merge request) Deprecated (3 changes) proto: Deprecate PreReceiveError field in UserMergeBranchResponse (merge request) proto: Deprecate PreReceiveError field in UserMergeToRefResponse (merge request) proto: Deprecate fine-grained repository maintenance RPCs (merge request) Removed (2 changes) operations: Remove deprecated squash_id from UserSquash RPC (merge request) git: Remove support for the Ruby hooks directory (merge request) Performance (2 changes) Makefile: Add more patches to speed up git-fetch(1) to v2.35.1.gl1 (merge request) git: Convert internal fetches to use sidechannel (merge request) --- devel/gitaly/Makefile | 9 +++++---- devel/gitaly/distinfo | 10 +++++----- devel/gitaly/files/patch-Makefile | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index ac656e9e8d7a..783d55913781 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 14.8.4 +DISTVERSION= 14.9.0 PORTREVISION= 0 CATEGORIES= devel @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.33.0:devel/git \ +MY_DEPENDS= git>=2.35.1:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \ @@ -49,7 +49,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= d35ed2db0cdea9f7494a7f6758c06bacf0160c53 +GL_COMMIT= b8dcfbb394eddfa30d27753a14792d54654cef56 # for go dependencies USE_GITHUB= nodefault @@ -155,7 +155,7 @@ GH_TUPLE= \ jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \ kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ kevinburke:ssh_config:4977a11b4351:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \ - libgit2:git2go:v33.0.6:libgit2_git2go_v33/vendor/github.com/libgit2/git2go/v33 \ + libgit2:git2go:v33.0.9:libgit2_git2go_v33/vendor/github.com/libgit2/git2go/v33 \ lightstep:lightstep-tracer-common:a8dfcb80d3a7:lightstep_lightstep_tracer_common_gogo/vendor/github.com/lightstep/lightstep-tracer-common \ lightstep:lightstep-tracer-go:v0.24.0:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ mattn:go-ieproxy:v0.0.1:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \ @@ -201,6 +201,7 @@ GH_TUPLE= \ GL_TUPLE= gitlab-org:gitlab-shell:50da611814d256c77e689977265ec7e07633a4dc:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ gitlab-org:labkit:397363e2404ac0276b1959373a1c1c2bc1610d67:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit + # 13dd post-extract: @${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 07e85a10fe6e..7e22ba635cb7 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1647601503 +TIMESTAMP = 1647946218 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 @@ -197,8 +197,8 @@ SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408 SHA256 (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 568ea6be8d237ca16dcd03e2fa5e07461ab596ccff40197ac34dac43f97389ec SIZE (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 17407 -SHA256 (libgit2-git2go-v33.0.6_GH0.tar.gz) = 14b0e4604f97b40e91d5d54ac01f4e2ea56014cf647d16063d692fbe8269a33f -SIZE (libgit2-git2go-v33.0.6_GH0.tar.gz) = 129055 +SHA256 (libgit2-git2go-v33.0.9_GH0.tar.gz) = bcdaa5ed86d7ad513f51cdd80006a23a7fa9d9e68db06b3ce39a25a4196e4d67 +SIZE (libgit2-git2go-v33.0.9_GH0.tar.gz) = 130832 SHA256 (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 0403290c66b3dd109d0a726784b8b0a8583c5d19d35d12a0c2b89a434ed2d0c6 SIZE (lightstep-lightstep-tracer-common-a8dfcb80d3a7_GH0.tar.gz) = 58493 SHA256 (lightstep-lightstep-tracer-go-v0.24.0_GH0.tar.gz) = 794c5cea97c46ee5a9139c1b2770cbd81d4534ba4359a8b6b744566c4abfb15b @@ -281,8 +281,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215 SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421 SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663 SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037 -SHA256 (gitlab-org-gitaly-d35ed2db0cdea9f7494a7f6758c06bacf0160c53_GL0.tar.gz) = 225b707bf7fe39973c4e1a6c568caf909a7c5cf5cb92b68a0be8eb40500dad0f -SIZE (gitlab-org-gitaly-d35ed2db0cdea9f7494a7f6758c06bacf0160c53_GL0.tar.gz) = 3804195 +SHA256 (gitlab-org-gitaly-b8dcfbb394eddfa30d27753a14792d54654cef56_GL0.tar.gz) = 119b89fcf49cdc885a816aa8984855220cbfef77a45fea11c6fc88aaf1552356 +SIZE (gitlab-org-gitaly-b8dcfbb394eddfa30d27753a14792d54654cef56_GL0.tar.gz) = 3848871 SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516 SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index e97345affa20..61a17c80685a 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-02-25 19:11:57 UTC +--- Makefile.orig 2022-03-21 09:11:43 UTC +++ Makefile -@@ -317,7 +317,7 @@ help: +@@ -314,7 +314,7 @@ help: .PHONY: build ## Build Go binaries and install required Ruby Gems. @@ -9,7 +9,7 @@ @ # We used to install Gitaly binaries into the source directory by default when executing @ # "make" or "make all", which has been changed in v14.5 to only build binaries into @ # `_build/bin`. In order to quickly fail in case any source install still refers to these -@@ -348,7 +348,7 @@ $(call find_commands): +@@ -345,7 +345,7 @@ $(call find_commands): @ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the @ # GNU build-id from the empty string and causing guaranteed collisions. GO_BUILD_ID=$$( go tool buildid $(addprefix ${BUILD_DIR}/bin/, $@) || openssl rand -hex 32 ) && \ @@ -18,7 +18,7 @@ go install -ldflags '${GO_LDFLAGS}'" -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $@) endif -@@ -558,7 +558,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -559,7 +559,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