cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

devel/gitaly: update to 15.6.0

Browse Source 
Required for gitlab-ce 15.6.

(cherry picked from commit ef8f303418)
This commit is contained in:
Matthias Fechner 2023-01-10 18:30:23 +02:00 committed by Matthias Fechner
parent 7d85ffd1bf
commit a77a0be468
4 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devel/gitaly/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= gitaly
DISTVERSION= 15.5.6
PORTREVISION= 2
DISTVERSION= 15.6.0
PORTREVISION= 0
DISTVERSIONPREFIX= v
CATEGORIES= devel
@ -16,25 +16,21 @@ 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.36.1:devel/git \
MY_DEPENDS= git>=2.37.0: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-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<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-gitaly>=15.5.0<15.6:net/rubygem-gitaly \
rubygem-gitlab-labkit>=0.25.0<1:devel/rubygem-gitlab-labkit \
rubygem-gitlab-labkit>=0.28<1:devel/rubygem-gitlab-labkit \
rubygem-licensee>=9.15<10:devel/rubygem-licensee \
rubygem-google-protobuf>=3.21.7<3.22:devel/rubygem-google-protobuf \
rubygem-google-protobuf>=3.21.9<3.22:devel/rubygem-google-protobuf \
rubygem-license_finder>=7.0<8:devel/rubygem-license_finder \
rubygem-redis4>=4.7<5:databases/rubygem-redis4
rubygem-redis4>=4.8.0<5:databases/rubygem-redis4
BUILD_DEPENDS= gem:devel/ruby-gems \
bash>0:shells/bash \
${MY_DEPENDS}
@ -54,7 +50,7 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
GL_COMMIT= 0380747ae595f37abb31ea65cca426b256733ae7
GL_COMMIT= 35525237b47fcc0e4b2b34502a851e1ea1fdd8a4
# for go dependencies
# Gitlab hosts there dependencies on their own platform and not on go-proxy

10
devel/gitaly/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1670479299
SHA256 (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/go.mod) = 0517ea73ce81c02cb2a1ec0930bc828be37bd82038970b03d84e210c855a3ea1
SIZE (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/go.mod) = 9532
SHA256 (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0.tar.gz) = a3060b0c94049099015da1b68c24e08b0f48c323e6ae492924402e6d19aabc5f
SIZE (go/devel_gitaly/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0/gitlab-org-gitaly-0380747ae595f37abb31ea65cca426b256733ae7_GL0.tar.gz) = 4150641
TIMESTAMP = 1669472360
SHA256 (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/go.mod) = f462be9eb2e9aefb06785123fade2685a03f9cc6e52b99490e734e50ce892e2c
SIZE (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/go.mod) = 9783
SHA256 (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0.tar.gz) = 9d887a02af6ccce05f6b29ca7867bb02d38379d09b0fc2a23fcea4d3a962ed43
SIZE (go/devel_gitaly/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0/gitlab-org-gitaly-35525237b47fcc0e4b2b34502a851e1ea1fdd8a4_GL0.tar.gz) = 2909541

10
devel/gitaly/files/patch-Makefile
View File

@ -1,14 +1,14 @@
--- Makefile.orig 2022-11-11 19:21:41 UTC
--- Makefile.orig 2022-11-21 09:43:30 UTC
+++ Makefile
@@ -548,7 +548,6 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
@@ -542,7 +542,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
${RUBY_BUNDLE_FILE}: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile
- ${Q}cd ${GITALY_RUBY_DIR} && bundle install
${Q}touch $@
${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE
@@ -593,7 +592,7 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BU
@@ -583,7 +582,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}" \
@@ -619,7 +618,6 @@ ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_
@@ -609,7 +608,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}

18
devel/gitaly/files/patch-ruby_Gemfile
View File

@ -1,6 +1,6 @@
--- ruby/Gemfile.orig 2022-12-07 19:19:46 UTC
--- ruby/Gemfile.orig 2022-11-21 09:43:30 UTC
+++ ruby/Gemfile
@@ -1,15 +1,15 @@
@@ -1,9 +1,9 @@
source 'https://rubygems.org'
gem 'rugged', '~> 1.2'
@ -10,22 +10,12 @@
+gem 'github-linguist', '~> 7.23', require: 'linguist'
+gem 'gitlab-markup', '~> 1.8.0'
+gem 'activesupport', '~> 6.1.6'
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
gem 'grpc', '~> 1.42.0' # keep in lock-step with grpc-tools
gem 'sentry-raven', '~> 3.0', require: false
-gem 'faraday', '~> 1.0'
+gem 'faraday', '~> 1.10.2'
gem 'rbtrace', require: false
# 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
@@ -26,19 +26,10 @@ gem 'google-protobuf', '~> 3.21.9'
# dependency and can thus be removed when the version constraint is gone.
-gem 'redis', '~> 4.7.1'
+gem 'redis', '~> 4.7'
gem 'redis', '~> 4.8.0'
-group :development, :test do
- gem 'rubocop', '~> 0.69', require: false