From nobody Mon Jan 30 21:31:47 2023 X-Original-To: dev-commits-ports-all@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 4P5Lwg6l9kz3ccwy; Mon, 30 Jan 2023 21:31:47 +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 4P5Lwg48Xqz4349; Mon, 30 Jan 2023 21:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675114307; 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=uAzUk2cuoMft6Lak8sgZYQVL7i9XdVcFpXfQTtBoZ60=; b=d6QHJbxBbO8HepgtzJjgHhqynGX8pdmP2I/u87EZ4NFw8hhLV0v15Rg2O3QEQD9Yae2hUh 6YWWKzs6n8AiYQM7PMSUHSo5SYxXcuIXi6hqsxU5isTy8YyoiSszKPTeUv/v5WHbOCF7PN tdMR1XsneAa2bNLhya7p/AejbLfXGviv8qYvOCtmaW0PUz32/MISgo9pgVl4OtpVqvUIUq utdHgX62lRTlFVjryDLbC6vpEeu4CxUYXWQSzuvbSLqKUZq8gD8uqhsm5tVCa5yJxN+2An eLdoCQELoQXk8ofXvQknrxKt0+QBcgTu4kHjuSuxpHvSaIE08XvwbAz76XFqNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675114307; 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=uAzUk2cuoMft6Lak8sgZYQVL7i9XdVcFpXfQTtBoZ60=; b=tJZ3Z85j4AetGIUxjVwoWrVyAn7sWrbezAOV8dljLRA6W9M067sfftrutIgw+cMdtnvZ9w ta5Tx/rcljk4JDR9DQCgHEqTb5VtUUU1JFVlBDJxQa62TgTA/vnWEy/BmP8+84lQxqDeu9 kdQ51XptwXk/8npdQE4QUG9+ZWUoiAxLBxuKUSt17g8ZTF2pvigm2eNueCt7i4CMFmEn6C gP9rwdp0UgfqKDXWo5rC/cWPtwGYCErrQ4dtz5GCTSol5hyF0SKzXsGaCFf/Oa+Vu74VPf nqmmEplpeaSPj5OYsp8/H6NokWlmi4IYwTtWV/RdXh8/FQ9vR6hZMHO4CbvMRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675114307; a=rsa-sha256; cv=none; b=rMMGywt1CpacdyxyAwstiPWuzLpfonyYGEwbNK2BOJOFOp4QN656WvglpmQRQ/iIL8eMaw 0XeBBj0GOgC6Wftl+Bm6J91LfIP5WuGDbnbYzSJhKD3vSgD+zRuP5n8hFuPx1oW2IcmOHf txEJ4IoX3eMMuWg1nOEZs/2zpHJP1YlOTTEf2mu2g+EhJ+2otEkQ4TifUH2yeK76RYMISB NASctiAAwFb6YAoh6iBcC+1g873XMxWGEIgkFbb/Xx9HpSoOfxJLG4ak8SAVOm3KKegJ2x Kb3JDz2eNPBXYJ4OBHjBn29k/r5mX9iD3hMGVl6HB6knYVkX3cCoE4eW+YPXwg== 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 4P5Lwg3G8zzNyn; Mon, 30 Jan 2023 21:31:47 +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 30ULVlI0001246; Mon, 30 Jan 2023 21:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30ULVlHg001245; Mon, 30 Jan 2023 21:31:47 GMT (envelope-from git) Date: Mon, 30 Jan 2023 21:31:47 GMT Message-Id: <202301302131.30ULVlHg001245@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: 41c8d3d87300 - main - devel/gitaly: update to 15.7.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 41c8d3d873004bdb6fd99db50ffd68226e7220b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=41c8d3d873004bdb6fd99db50ffd68226e7220b4 commit 41c8d3d873004bdb6fd99db50ffd68226e7220b4 Author: Matthias Fechner AuthorDate: 2023-01-30 21:14:44 +0000 Commit: Matthias Fechner CommitDate: 2023-01-30 21:25:39 +0000 devel/gitaly: update to 15.7.5 Required for gitlab-ce 15.7 update Changelog: https://gitlab.com/gitlab-org/gitaly/-/blob/master/CHANGELOG.md --- devel/gitaly/Makefile | 13 ++++++------- devel/gitaly/distinfo | 10 +++++----- devel/gitaly/files/patch-Makefile | 8 ++++---- devel/gitaly/files/patch-ruby_Gemfile | 8 +++----- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 28ae6737aadc..6c15517de9e1 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitaly -DISTVERSION= 15.6.4 -PORTREVISION= 1 +DISTVERSION= 15.7.5 +PORTREVISION= 0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -16,19 +16,18 @@ 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.37.4:devel/git \ +MY_DEPENDS= git>=2.39.1:devel/git \ rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ - rubygem-github-linguist>=7.23<8:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport61>=6.1.6<6.2:devel/rubygem-activesupport61 \ rubygem-grpc142>=1.42.0<2:net/rubygem-grpc142 \ rubygem-sentry-raven>=3.0<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.28<1:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.29<1:devel/rubygem-gitlab-labkit \ rubygem-licensee>=9.15<10:devel/rubygem-licensee \ - rubygem-google-protobuf>=3.21.9<3.22:devel/rubygem-google-protobuf \ + rubygem-google-protobuf>=3.21.12<3.22:devel/rubygem-google-protobuf \ 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 \ @@ -49,7 +48,7 @@ MAKE_ENV+= ${GO_ENV} USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96 +GL_COMMIT= 57d78fe8f442192f4aaa38a023b4d1d3582c6dcd # 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 0c1ba217771a..765fed6e6df9 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1673369099 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/go.mod) = f462be9eb2e9aefb06785123fade2685a03f9cc6e52b99490e734e50ce892e2c -SIZE (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/go.mod) = 9783 -SHA256 (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0.tar.gz) = 450eabeb8fb61634dd83b83a34f2e226eaa2cebc054babc153eb7c7b07b84f92 -SIZE (go/devel_gitaly/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0/gitlab-org-gitaly-be44bc7f01a5bfbd320e75aa87c5e8a64a6c8f96_GL0.tar.gz) = 2910993 +TIMESTAMP = 1674285960 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-57d78fe8f442192f4aaa38a023b4d1d3582c6dcd_GL0/go.mod) = 86426a8a5d90c317c874ea12c0da2cbd322fcb48f471cccd83dedbf4f6cff8b0 +SIZE (go/devel_gitaly/gitlab-org-gitaly-57d78fe8f442192f4aaa38a023b4d1d3582c6dcd_GL0/go.mod) = 9758 +SHA256 (go/devel_gitaly/gitlab-org-gitaly-57d78fe8f442192f4aaa38a023b4d1d3582c6dcd_GL0/gitlab-org-gitaly-57d78fe8f442192f4aaa38a023b4d1d3582c6dcd_GL0.tar.gz) = 8ae5d4c2ee9e40b6268faba0bf763c322c9b9edd294ef802202f11cdc489d21a +SIZE (go/devel_gitaly/gitlab-org-gitaly-57d78fe8f442192f4aaa38a023b4d1d3582c6dcd_GL0/gitlab-org-gitaly-57d78fe8f442192f4aaa38a023b4d1d3582c6dcd_GL0.tar.gz) = 2937873 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile index e59420d5a8a0..ffe91696db56 100644 --- a/devel/gitaly/files/patch-Makefile +++ b/devel/gitaly/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-11-21 09:43:30 UTC +--- Makefile.orig 2023-01-12 20:00:15 UTC +++ Makefile -@@ -542,7 +542,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a +@@ -545,7 +545,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 -@@ -583,7 +582,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU +@@ -586,7 +585,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}" \ -@@ -609,7 +608,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_ +@@ -612,7 +611,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 be0367a4849e..de8e2a38653c 100644 --- a/devel/gitaly/files/patch-ruby_Gemfile +++ b/devel/gitaly/files/patch-ruby_Gemfile @@ -1,19 +1,17 @@ ---- ruby/Gemfile.orig 2022-11-21 09:43:30 UTC +--- ruby/Gemfile.orig 2023-01-12 20:00:15 UTC +++ ruby/Gemfile -@@ -1,9 +1,9 @@ +@@ -1,8 +1,8 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' --gem 'github-linguist', '~> 7.20.0', require: 'linguist' -gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.1.6.1' -+gem 'github-linguist', '~> 7.23', require: 'linguist' +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 -@@ -26,19 +26,10 @@ gem 'google-protobuf', '~> 3.21.9' +@@ -25,19 +25,10 @@ gem 'google-protobuf', '~> 3.21.12' # dependency and can thus be removed when the version constraint is gone. gem 'redis', '~> 4.8.0'