From nobody Sat Apr 8 18:25:06 2023 X-Original-To: dev-commits-ports-branches@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 4Pv3Yt52Ykz44jfk; Sat, 8 Apr 2023 18:25:06 +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 4Pv3Yt342nz3ksQ; Sat, 8 Apr 2023 18:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680978306; 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=CezNeSIZ01Wnd5FSiuG/40D9uON+QVjgpCGCUvnG38c=; b=Y/ZigAYiTbtX/phFuLmdvtEES2elk11ryGHcRn1tP2s7IXKgNYFSt58aQ9PvNzUEWSOvNx cNCQ2Nc5+CTXZEbbfHFsTBBrRqdZWuUj1D1EJg7lJLwD0CgQ5/D9SQswSYNf5YAhFFhXCe pU7DsgQfWYO+o3YZRuN1vS00sFs6aMSAk/yaBcBpRU8R0khbqzdQ66IqSlwmIHsTdkuy0E DWvvqjdqcafF1n7HyBmgDXYzzLtWyHXhcML/YhmJd8yPLPu5yzwABLPCBb08wq8RQNKnoU /UUueidZ8P2XwPHL4+nhD5ig3PM60822YoD5sIAy1ExGKAowgFSKtbiNL6tG5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680978306; 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=CezNeSIZ01Wnd5FSiuG/40D9uON+QVjgpCGCUvnG38c=; b=FzNW1knZub3O1opD5JTRzwn5ZhFm5mT2krvUfHTpN1TLw1+JsJw3A1B2VyXk44gaolGRDI 3dVU7xZhezu8IrNsq11dMT0ieb5TnUN5zcNFtflgrc6TovtoPURp3nUGD1N0oK5gS4nYfs +tDDILNqBOl7RZeGZHrw9cmPJnbdYgAMI540zVx+zTO2R3dANGd7HOUSz+r6YsUcJJ319J 06nK7yU+mmCFg68rHCRzko258p/GY9LSLAF3f2/YXSImB6nhE7WaxnZhy3hTLMb3c7M+qj VeeSwDd2eZ8v8qc6dCp2oTX0Fp31p1qvsQd6x8yTQM7DVRSN/E4DNAVcZ3/tfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680978306; a=rsa-sha256; cv=none; b=wF+Thtz7ydCJyQzM1oJs15g5kTg5ikhd3bd9xum4vPiYgX5XJa7Vv7UV8uYJyAzTc+alpp gC9TkToQnkL7wA9tl3WKwp+U4aNLLwvALU525q+y9e/1kQHSElj+0czwJerOvjZx+gcPlP TZgCI84AL9Os0RREC+eCzT8BFh+TiNYHuPMdaM4r0l+57pI3Jq5fd2xSn8DNPuJcVZDhcy wAZ5O2nquNCl5tyxFeQzfeQVrDyXTdnRkHfW0c/3swy2IfR06O1hPuCbx02tzOAA5hc4Bt Ul0ilg+N1mMMcHg8z7r3BHsIGpE5uIlJXhlQTqcqQlDBALknMTjtYdCezIw00A== 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 4Pv3Yt27QPzcyS; Sat, 8 Apr 2023 18:25:06 +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 338IP6ok086430; Sat, 8 Apr 2023 18:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338IP6lZ086429; Sat, 8 Apr 2023 18:25:06 GMT (envelope-from git) Date: Sat, 8 Apr 2023 18:25:06 GMT Message-Id: <202304081825.338IP6lZ086429@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: c92acb9f1b62 - 2023Q2 - devel/gitaly: update to 15.9.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: c92acb9f1b629671e87dc26de3c98650432a8fd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c92acb9f1b629671e87dc26de3c98650432a8fd9 commit c92acb9f1b629671e87dc26de3c98650432a8fd9 Author: Matthias Fechner AuthorDate: 2023-02-27 07:56:19 +0000 Commit: Matthias Fechner CommitDate: 2023-04-08 18:24:15 +0000 devel/gitaly: update to 15.9.0 Required for gitlab-ce 15.9 (cherry picked from commit e6e749e5187c2548b7fbd0a37a171bdcb48751d8) --- devel/gitaly/Makefile | 21 ++++++++++---------- devel/gitaly/distinfo | 10 +++++----- devel/gitaly/files/patch-Makefile | 8 ++++---- devel/gitaly/files/patch-ruby_Gemfile | 36 ++++++++++++++++++++--------------- 4 files changed, 41 insertions(+), 34 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index d0f63b09cc20..23385f04db3b 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly -DISTVERSION= 15.8.4 -PORTREVISION= 2 +DISTVERSION= 15.9.0 +PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -18,23 +18,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS MY_DEPENDS= git>=2.39.2:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ - rubygem-rugged>=1.2<2:devel/rubygem-rugged \ - rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport61>=6.1.6<6.2:devel/rubygem-activesupport61 \ + rubygem-rugged>=1.5.1<1.6:devel/rubygem-rugged \ + rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \ + rubygem-activesupport61>=6.1.7.2<6.1.8:devel/rubygem-activesupport61 \ rubygem-grpc142>=1.42.0<2:net/rubygem-grpc142 \ - rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \ + rubygem-sentry-raven>=3.1<4:devel/rubygem-sentry-raven \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ - rubygem-gitaly>=15.5.0<15.6:net/rubygem-gitaly \ - rubygem-gitlab-labkit>=0.29<1:devel/rubygem-gitlab-labkit \ + rubygem-gitaly>=15.5.0<15.10:net/rubygem-gitaly \ + rubygem-gitlab-labkit>=0.31<1:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ rubygem-google-protobuf>=3.21.12<3.22:devel/rubygem-google-protobuf \ + rubygem-nokogiri>=1.14.1<1.15:textproc/rubygem-nokogiri \ rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \ rubygem-redis4>=4.8.0<5:databases/rubygem-redis4 BUILD_DEPENDS= gem:devel/ruby-gems \ bash>0:shells/bash \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ - gitlab-shell>=13.22.1:devel/gitlab-shell + gitlab-shell>=14.17.0:devel/gitlab-shell LIB_DEPENDS= libgit2.so:devel/libgit2 USES= cpe gmake go:modules,no_targets pkgconfig ruby @@ -48,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= 158a9e7f7acea1d93fff2dac4e2421f78de53875 +GL_COMMIT= 8839b0c454f83f6ae35a2a6da3041db19384c411 # 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 22de06f43de3..00f2140a2336 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1677873622 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/go.mod) = 28e105ea47304435dc1432661b97514170a8df58bc74075417a2e934b57c0d43 -SIZE (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/go.mod) = 9702 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0.tar.gz) = f37281f64232560d9c372ef96d8e6721a0f04d41a54971e828569a4caf654426 -SIZE (go/devel_gitaly/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0/gitlab-org-gitaly-158a9e7f7acea1d93fff2dac4e2421f78de53875_GL0.tar.gz) = 2957888 +TIMESTAMP = 1677095305 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/go.mod) = 605d47badb908e81ce1f6f50b9946a215c2600e2423f10239aa0885c92413a90 +SIZE (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/go.mod) = 10219 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0.tar.gz) = 3070339161e0dd6731147b58ebd12e7c024c2c56d61e2e4b96cf70c03f77bc17 +SIZE (go/devel_gitaly/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0/gitlab-org-gitaly-8839b0c454f83f6ae35a2a6da3041db19384c411_GL0.tar.gz) = 3060534 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index ffe91696db56..5a2ec4e65496 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2023-01-12 20:00:15 UTC +--- Makefile.orig 2023-02-21 16:36:17 UTC +++ Makefile -@@ -545,7 +545,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -546,7 +546,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. ${RUBY_BUNDLE_FILE}: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile @@ -8,7 +8,7 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -586,7 +585,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU +@@ -587,7 +586,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}" \ -@@ -612,7 +611,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ +@@ -613,7 +612,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 de8e2a38653c..40f422023aa7 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,27 +1,33 @@ ---- ruby/Gemfile.orig 2023-01-12 20:00:15 UTC +--- ruby/Gemfile.orig 2023-02-21 16:36:17 UTC +++ ruby/Gemfile -@@ -1,8 +1,8 @@ +@@ -1,7 +1,7 @@ source 'https://rubygems.org' - gem 'rugged', '~> 1.2' --gem 'gitlab-markup', '~> 1.7.1' --gem 'activesupport', '~> 6.1.6.1' -+gem 'gitlab-markup', '~> 1.8.0' -+gem 'activesupport', '~> 6.1.6' - gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools - gem 'sentry-raven', '~> 3.0', require: false - gem 'rbtrace', require: false -@@ -25,19 +25,10 @@ gem 'google-protobuf', '~> 3.21.12' + gem 'rugged', '~> 1.5.1' +-gem 'gitlab-markup', '~> 1.8.0' ++gem 'gitlab-markup', '~> 1.9.0' + gem 'activesupport', '~> 6.1.7.2' + gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools in ../tools/protogem + gem 'sentry-raven', '~> 3.1', require: false +@@ -9,7 +9,7 @@ gem 'rbtrace', require: false + + # The Gitaly Gem contains the Protobuf and gRPC definitions required by the + # Ruby sidecar. +-gem 'gitaly', '~> 15.5.0' ++gem 'gitaly', '~> 15.5' + + # Labkit provides observability functionality + gem 'gitlab-labkit', '~> 0.31' +@@ -26,18 +26,10 @@ gem 'nokogiri', '~> 1.14' # dependency and can thus be removed when the version constraint is gone. gem 'redis', '~> 4.8.0' -group :development, :test do -- gem 'rubocop', '~> 0.69', require: false -- gem 'rspec', require: false +- gem 'rubocop', '~> 1.38', require: false +- gem 'rspec', '~> 3.12.0', require: false - gem 'rspec-parameterized', require: false -- gem 'timecop', require: false - gem 'factory_bot', require: false -- gem 'pry', '~> 0.12.2', require: false +- gem 'pry', '~> 0.13.1', require: false -end - # Gems required in omnibus-gitlab pipeline