From nobody Tue Nov 22 09:39:11 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 4NGfNJ1Mytz4jQFQ; Tue, 22 Nov 2022 09:39:12 +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 4NGfNH73xXz3pwS; Tue, 22 Nov 2022 09:39:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669109952; 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=4TAL7kFqjnmU2wKsAcWuCpqWcDTH9X8vj+PG7cfFf4I=; b=Oua3wVegzgRgO2n4ON8JDOSeUuGQPMRXSpYs7YhdqLr244SZAzRhLtQfAY8MquXzXKagEI X6NLEkcdPbz+EDx+gbjG5bOJv3valAnlQjGw7hc/1dbVdMIWDdyi1FwQ73XMmVs6JAI/a1 iKY+40Qtf0HNDHfbpvzjuyLW4XatE5aRtiaE+V3v/B2WPyXNBXkz89UwsILUY1+bsttfZc QXmpq4xwVuRhi8BQiYEMo5vfBphON8GYxMdk/GidW+06gAws2PyTo5AykS4ZCmnibo0MYo iNtplwZMSOBGopb+sx15rzhW8zSohHUJXGrus/76XYV++6CymPjdfgaKMCIUTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669109952; 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=4TAL7kFqjnmU2wKsAcWuCpqWcDTH9X8vj+PG7cfFf4I=; b=Lua3S6BMNTRnY4A6gFGfUxDRAhAsQziRT3fMVN8gIjl73zvKVm2X8/40tWEBUFrOwJEZBR EwSi89vr0tceUkBdzgD2Pxwut/GjVNfW7OUfGqPEUhlxa60wHbS2j2ObK5Cl/2oWWKI6En jq9Oh/75adsucdFy1YMMCoUTCH/SzEz2t1RGIkVpYZWRfH2Harii7vJZouiPMn7g/Zi53w mG+6SEyfmGfEGTQp5boggN5c7ztgnABmBL+cnMc3C2IkU6cyEkDQtjm0j+a5r2ROlWJqkS cmpa8+d9ttSwLmQROORiBYMT6N/OxKzxRxxHV6eU8VwP2v3JVOj0/6shrmr38A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669109952; a=rsa-sha256; cv=none; b=TRZggktm/p5fuMPrk3EfPDp4Q90FHw9JxU38mcecxqDLHiq7Fq4YFR5hgbk/mcPfhwV0Ox 6qEPBoW+nbrRoRW/uHabXnEUAmWhsyt7JQJdQWpPtqZNIkpgPTZ33Bjh1WI8pG0YAAW26N 2DMYdfo7y1dS2TzcHN/tkg2Qs50X1eXT2VFOCk/OoL2WnYgO/dlcGhedJoKfLwAXl6CluZ 68pFzkJigmWijCBlPVopOVU2TPXnGgZQNdvmGOdub72HdX2p55H9tpVGUtqG3Re5dxj3ec K91yHO3pVOYZgGqQdEjUfe//K+JlpdbgIU480hmzRMeONERF4O2PBuHBMqiUEQ== 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 4NGfNH60trzdkC; Tue, 22 Nov 2022 09:39:11 +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 2AM9dBlL058731; Tue, 22 Nov 2022 09:39:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AM9dBCi058730; Tue, 22 Nov 2022 09:39:11 GMT (envelope-from git) Date: Tue, 22 Nov 2022 09:39:11 GMT Message-Id: <202211220939.2AM9dBCi058730@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: 7143cb61f571 - main - devel/gitaly: update to 15.5.4 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: 7143cb61f571156ca42a04799570d8d13a8168b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=7143cb61f571156ca42a04799570d8d13a8168b7 commit 7143cb61f571156ca42a04799570d8d13a8168b7 Author: Matthias Fechner AuthorDate: 2022-11-20 16:53:43 +0000 Commit: Matthias Fechner CommitDate: 2022-11-22 09:38:28 +0000 devel/gitaly: update to 15.5.4 Required for gitlab-ce 15.5 update. --- devel/gitaly/Makefile | 14 ++++++++------ devel/gitaly/distinfo | 10 +++++----- devel/gitaly/files/patch-Makefile | 8 ++++---- devel/gitaly/files/patch-ruby_Gemfile | 17 +++++++++-------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index b228c7544fbc..da4e404f7b34 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.4.4 +DISTVERSION= 15.5.4 PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -25,14 +25,16 @@ MY_DEPENDS= git>=2.36.1:devel/git \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.2<4.2.8:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \ - rubygem-grpc142>=1.42.0.pre1<2:net/rubygem-grpc142 \ + rubygem-grpc142>=1.42.0<2:net/rubygem-grpc142 \ rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \ rubygem-faraday1>=1.0.1<2:www/rubygem-faraday1 \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ - rubygem-gitlab-labkit>=0.24.0<1:devel/rubygem-gitlab-labkit \ + rubygem-gitaly>=15.5.0<15.6:net/rubygem-gitaly \ + rubygem-gitlab-labkit>=0.25.0<1:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ - rubygem-google-protobuf>=3.21.0<3.22:devel/rubygem-google-protobuf \ - rubygem-license_finder>=7.0<8:devel/rubygem-license_finder + rubygem-google-protobuf>=3.21.7<3.22:devel/rubygem-google-protobuf \ + rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \ + rubygem-redis4>=4.7<5:databases/rubygem-redis4 BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ ${MY_DEPENDS} @@ -52,7 +54,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= cb734b28e9ae84d2320c73b168dd1c97f561d99b +GL_COMMIT= 631c94433ca5017be566bb65f4ac792ab672e956 # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index ddcd0efd3e29..8b8a27c4ff85 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1667627234 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-cb734b28e9ae84d2320c73b168dd1c97f561d99b_GL0/go.mod) = 190a364531e4bec89791667462ada89c60e2bbc218ccdd455d0d26bee55d2f54 -SIZE (go/devel_gitaly/gitlab-org-gitaly-cb734b28e9ae84d2320c73b168dd1c97f561d99b_GL0/go.mod) = 9498 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-cb734b28e9ae84d2320c73b168dd1c97f561d99b_GL0/gitlab-org-gitaly-cb734b28e9ae84d2320c73b168dd1c97f561d99b_GL0.tar.gz) = f017719875776170d33e4b282f3e2618d2437d6a3ffc7ab1235578fdfda104a1 -SIZE (go/devel_gitaly/gitlab-org-gitaly-cb734b28e9ae84d2320c73b168dd1c97f561d99b_GL0/gitlab-org-gitaly-cb734b28e9ae84d2320c73b168dd1c97f561d99b_GL0.tar.gz) = 4051161 +TIMESTAMP = 1668844707 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/go.mod) = 0517ea73ce81c02cb2a1ec0930bc828be37bd82038970b03d84e210c855a3ea1 +SIZE (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/go.mod) = 9532 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0.tar.gz) = f05d698812d5eb4326a30c428459ea3a2eb0c0c3380ad6421e2a21d7560d5fc4 +SIZE (go/devel_gitaly/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0/gitlab-org-gitaly-631c94433ca5017be566bb65f4ac792ab672e956_GL0.tar.gz) = 4150219 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index c4f1ccb1a5f7..ffaffb43b500 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-09-29 08:34:44 UTC +--- Makefile.orig 2022-11-11 19:21:41 UTC +++ Makefile -@@ -547,7 +547,6 @@ ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile +@@ -548,7 +548,6 @@ 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 @@ -8,7 +8,7 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -598,7 +597,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU +@@ -593,7 +592,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU @ # 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. ${Q}GO_BUILD_ID=$$(go tool buildid "$<" || openssl rand -hex 32) && \ @@ -17,7 +17,7 @@ if test "${OS}" = "Linux"; then \ go run "${SOURCE_DIR}"/tools/replace-buildid \ -input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \ -@@ -624,7 +623,6 @@ ${BUILD_DIR}/intermediate/gitaly-git2go: GO_BUILD_ +@@ -619,7 +618,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ ${BUILD_DIR}/intermediate/gitaly: remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES} ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} ${BUILD_DIR}/intermediate/gitaly-git2go: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index cfa481cf9de2..a9090f3b7ff5 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,6 +1,6 @@ ---- ruby/Gemfile.orig 2022-09-29 08:34:44 UTC +--- ruby/Gemfile.orig 2022-11-11 19:21:41 UTC +++ ruby/Gemfile -@@ -1,15 +1,15 @@ gem 'rugged', '~> 1.2' +@@ -1,15 +1,15 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' @@ -19,10 +19,13 @@ +gem 'faraday', '~> 1.10.2' gem 'rbtrace', require: false - # Labkit provides observability functionality -@@ -21,21 +21,10 @@ gem 'google-protobuf', '~> 3.21.0' - - gem 'google-protobuf', '~> 3.21.0' + # The Gitaly Gem contains the Protobuf and gRPC definitions required by the +@@ -28,21 +28,12 @@ gem 'google-protobuf', '~> 3.21.7' + # Rails is currently blocked on the upgrade to the new major version for Redis, + # so we don't upgrade either until the issue is resolved. This is an indirect + # dependency and can thus be removed when the version constraint is gone. +-gem 'redis', '~> 4.7.1' ++gem 'redis', '~> 4.7' -group :development, :test do - gem 'rubocop', '~> 0.69', require: false @@ -31,8 +34,6 @@ - gem 'timecop', require: false - gem 'factory_bot', require: false - gem 'pry', '~> 0.12.2', require: false -- -- gem 'grpc-tools', '~> 1.42.0' -end - # Gems required in omnibus-gitlab pipeline