From nobody Thu Aug 25 13:21:07 2022 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 4MD3WS1N79z4ZY1x; Thu, 25 Aug 2022 13:21:08 +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 4MD3WR6dYrz47tC; Thu, 25 Aug 2022 13:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661433667; 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=Hc9Vb9fVkyCQYonO4VGIE7WiADKeLY7sAgh2qpgKYR4=; b=f85TwoLqsZW8ciCqhqnddyWLbZfDy4VoNxVBu4GtOH/+H5ZNqE40MALR8q+8UGj+VoO2vB Pt2q3aBkHfCE4KKPf73arxxohrcTlFD3YdXHCI5+3hYwl/qW5qM1XidbXL907AYO1MjDUy nSHuPY/H5MIiyklsgEWUcBF8hgc0K8GmP8uFAmItWvN7ftLIn/qEkM/lGNOPuBcfvkoqFL SCU5mV50KviAL+4KXOnsqkQFqSw5EFtgvW0US8+cGVf7B55S0K/ov6wb9PxkMjm/m85K0c tUbEjxSMge87LTpcUyUYtFkIgk1mbmx2rGSRSdfI7JpxjQuXdyv0Pbyy00M4Tw== 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 4MD3WR5jjczpml; Thu, 25 Aug 2022 13:21:07 +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 27PDL7m8089350; Thu, 25 Aug 2022 13:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PDL7Ln089349; Thu, 25 Aug 2022 13:21:07 GMT (envelope-from git) Date: Thu, 25 Aug 2022 13:21:07 GMT Message-Id: <202208251321.27PDL7Ln089349@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: 6019bd252484 - 2022Q3 - devel/gitaly: update to 15.2 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 6019bd2524844dc9f429340e82ae4062af2925e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661433667; 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=Hc9Vb9fVkyCQYonO4VGIE7WiADKeLY7sAgh2qpgKYR4=; b=C9oqjPuhzp4Xgsdd3eLk14bPHzyIBxNBmTgYhKWLS+FAwodzbXy0LUVZOYWK1VCdWkzRJ4 iw1QVDEfvyW4OCn95VnFz2guwYeXughnGrnQG8ty3ebO24ETMMXeH9K0osnUpBLHpE5j88 GR82uJGghulhoIKRRo9IUe0PzXfzOwgxPXNG88dSTot4w7QTEGKd2heWG3C823D/Js80K9 GNJgUlTvoZOSejf1Rr5oXKpinNpKVpjenNJSrd86B1nxdHa4fvnxqy+Rs9J/yI0NG4eMqD EHyhKMSUtfjAev0hQztkhy5isgQ1eUegskDpSPmx3n1v/nkEPskMFKu+q2HdcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661433667; a=rsa-sha256; cv=none; b=xaWWi0A5Mkn7tyN+sPVhtVEo1jttvs0npSJtD/l5kN2qGb3fZr0xiFXlA5ksxpJhejP/Lw yih/PuGZCVIlFFziAhOTE0wCXZsfCiSkf45Eg8w7bJfbcbYXxfdawJvu25NtGktP7moplc D4ueKj+jiCuyLQUEBB+RUQC+Jq1b2DAIK+B39YeM9J7Z0nZQmbtKPa/MdMKWb7F0uNgqle BW/zBsevTrNkYULGavVHOqjb0jTvvLEhaHnhPEG0rKHMFvwxylhrYRHt4P46UK99gjjVT3 nJn6eq+sFOPhAECvze3YmamiQSftCxYXdN8hiBphagfKkgkMvREYIXwR4+7R3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6019bd2524844dc9f429340e82ae4062af2925e8 commit 6019bd2524844dc9f429340e82ae4062af2925e8 Author: Matthias Fechner AuthorDate: 2022-08-16 07:10:43 +0000 Commit: Matthias Fechner CommitDate: 2022-08-25 13:20:18 +0000 devel/gitaly: update to 15.2 Required for gitlab-ce 15.2 (cherry picked from commit eecea0dcbfdbd974d7acc07ac7acbf25d0bf3536) --- devel/gitaly/Makefile | 8 ++++---- devel/gitaly/distinfo | 10 +++++----- devel/gitaly/files/patch-Makefile | 22 +++++++++++----------- devel/gitaly/files/patch-ruby_Gemfile | 18 ++++++------------ 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index b2e53bd7ed65..d45e5514ddc6 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 15.1.4 +DISTVERSION= 15.2.0 DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= devel @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.36.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 \ + rubygem-github-linguist>=7.20<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport61>=6.1.4.7<6.1.7:devel/rubygem-activesupport61 \ rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \ @@ -28,7 +28,7 @@ MY_DEPENDS= git>=2.36.1:devel/git \ 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.22.0<0.24:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.23.0<1:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ rubygem-google-protobuf319>=3.19.0<3.20:devel/rubygem-google-protobuf319 \ rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder @@ -51,7 +51,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= bde9c15df3104aad76ad7b919954718ac81c3b1f +GL_COMMIT= 91f52100ffca75bb08e295d34da3a02a46c5df78 # 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 bd69c12139c3..bfbc5da7f6b0 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1659071493 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-bde9c15df3104aad76ad7b919954718ac81c3b1f_GL0/go.mod) = da3660541474ccb9c6cbe923f17450ae26a1d3c4465b9125281ff4361a7cb45b -SIZE (go/devel_gitaly/gitlab-org-gitaly-bde9c15df3104aad76ad7b919954718ac81c3b1f_GL0/go.mod) = 2054 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-bde9c15df3104aad76ad7b919954718ac81c3b1f_GL0/gitlab-org-gitaly-bde9c15df3104aad76ad7b919954718ac81c3b1f_GL0.tar.gz) = 7ee9ffecf947e5b3c2f5418d0ce525da7997ca83173aa61768a5f217247f4c97 -SIZE (go/devel_gitaly/gitlab-org-gitaly-bde9c15df3104aad76ad7b919954718ac81c3b1f_GL0/gitlab-org-gitaly-bde9c15df3104aad76ad7b919954718ac81c3b1f_GL0.tar.gz) = 3940027 +TIMESTAMP = 1658817992 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/go.mod) = dc003dfe788c03dfd145369d4d81321f1306df51dac7289a6491dc84e25b2bbc +SIZE (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/go.mod) = 9144 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0.tar.gz) = f3be6247359252ccad7dbb67c18819213310488842c7370d84766d8e2e40783a +SIZE (go/devel_gitaly/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0/gitlab-org-gitaly-91f52100ffca75bb08e295d34da3a02a46c5df78_GL0.tar.gz) = 4001229 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index cf5e2865e049..5394a42fc0b5 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,15 +1,15 @@ ---- Makefile.orig 2022-06-21 10:12:22 UTC +--- Makefile.orig 2022-07-21 13:59:14 UTC +++ Makefile -@@ -235,7 +235,7 @@ TEST_REPO_GIT := ${TEST_REPO_DIR}/gitlab-git-test. +@@ -247,7 +247,7 @@ TEST_REPO_GIT := ${TEST_REPO_DIR}/gitlab-git-test. BENCHMARK_REPO := ${TEST_REPO_DIR}/benchmark.git - # All executables provided by Gitaly --GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) gitaly-git2go-v14) -+GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) ) + # All executables provided by Gitaly. +-GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) gitaly-git2go-v14) ++GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) ) + # All executables packed inside the Gitaly binary. + GITALY_PACKED_EXECUTABLES = $(filter %gitaly-hooks %gitaly-git2go-v15 %gitaly-ssh %gitaly-lfs-smudge, ${GITALY_EXECUTABLES}) # Find all Go source files. - find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -name ruby -o -name vendor -o -name testdata -o -name '_*' -o -path '*/proto/go/gitalypb' \) -prune -o -type f -name '*.go' -not -name '*.pb.go' -print | sort -u) - -@@ -497,7 +497,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -533,7 +533,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 @@ -17,7 +17,7 @@ ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE -@@ -548,7 +547,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU +@@ -584,7 +583,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) && \ @@ -26,8 +26,8 @@ if test "${OS}" = "Linux"; then \ go run "${SOURCE_DIR}"/tools/replace-buildid \ -input "$<" -input-build-id "${TEMPORARY_BUILD_ID}" \ -@@ -560,22 +559,11 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU - ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} +@@ -597,22 +596,11 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ + ${BUILD_DIR}/intermediate/gitaly: ${GITALY_PACKED_EXECUTABLES} ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} ${BUILD_DIR}/intermediate/gitaly-git2go-v15: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} -${BUILD_DIR}/intermediate/gitaly-git2go-v15: libgit2 diff --git a/devel/gitaly/files/patch-ruby_Gemfile b/devel/gitaly/files/patch-ruby_Gemfile index a4f633b918c9..cacfa5d52e14 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,25 +1,19 @@ ---- ruby/Gemfile.orig 2022-06-21 10:12:22 UTC +--- ruby/Gemfile.orig 2022-07-21 13:59:14 UTC +++ ruby/Gemfile -@@ -2,8 +2,8 @@ source 'https://rubygems.org' +@@ -1,9 +1,9 @@ + source 'https://rubygems.org' gem 'rugged', '~> 1.2' - gem 'github-linguist', '~> 7.12', require: 'linguist' +-gem 'github-linguist', '~> 7.20.0', require: 'linguist' -gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.4.7' ++gem 'github-linguist', '~> 7.20', require: 'linguist' +gem 'gitlab-markup', '~> 1.8.0' +gem 'activesupport', '~> 6.1.4' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false -@@ -13,24 +13,13 @@ gem 'faraday', '~> 1.0' - gem 'rbtrace', require: false - - # Labkit provides observability functionality --gem 'gitlab-labkit', '~> 0.21.1' -+gem 'gitlab-labkit', '~> 0.23.0' - - # Detects the open source license the repository includes - # This version needs to be in sync with GitLab CE/EE +@@ -20,17 +20,6 @@ gem 'gitlab-labkit', '~> 0.23' gem 'licensee', '~> 9.14.1' gem 'google-protobuf', '~> 3.19.0'