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

Udate to 12.8.1 which is required for gitlab-ce 12.8 upgrade.

Browse Source
This commit is contained in:
Matthias Fechner 2020-02-25 15:46:48 +00:00
parent 6b4f8564bc
commit be06ec9e83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=527085
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/gitaly/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitaly
DISTVERSION= 1.83.0
DISTVERSION= 12.8.1
PORTREVISION= 0
CATEGORIES= devel
@ -12,12 +12,12 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
# define dependencies that are required for build and run under MY_DEPENDS
MY_DEPENDS= git>=2.21:devel/git \
MY_DEPENDS= git>=2.22:devel/git \
rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \
rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \
rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport52>=5.2.3<5.3.0:devel/rubygem-activesupport52 \
rubygem-activesupport60>=6.0.2.1<6.1:devel/rubygem-activesupport60 \
rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.7<4.2.8.0:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
@ -25,7 +25,7 @@ MY_DEPENDS= git>=2.21:devel/git \
rubygem-sentry-raven29>=2.9.0<2.10.0:devel/rubygem-sentry-raven29 \
rubygem-faraday>=0.12<1.0:www/rubygem-faraday \
rubygem-rbtrace>0:devel/rubygem-rbtrace \
rubygem-gitlab-labkit>=0.8.0<0.9.0:devel/rubygem-gitlab-labkit \
rubygem-gitlab-labkit>=0.9.1<0.10.0:devel/rubygem-gitlab-labkit \
rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \
rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38
BUILD_DEPENDS= gem:devel/ruby-gems \
@ -41,7 +41,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/tags
GL_COMMIT= f63adf19271e150a338eb90479b7afeb94340ed9
GL_COMMIT= 61393768996e58bd5df436526cb46d5612ead584
# for go dependencies
USE_GITHUB= nodefault
@ -57,7 +57,7 @@ GH_TUPLE= \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
getsentry:sentry-go:v0.3.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \
go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \
go-yaml:yaml:v2.2.5:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
golang:net:3b0461eec859:golang_net/vendor/golang.org/x/net \
golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \

10
devel/gitaly/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1580548863
TIMESTAMP = 1582631449
SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84
@ -17,8 +17,8 @@ SHA256 (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 16907c25fc86802614579a6a8e638fe
SIZE (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 57823
SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4bf25eb03f8224eef5934158da81650063a96b53ff4f50b9ff5409
SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726
SHA256 (go-yaml-yaml-v2.2.5_GH0.tar.gz) = 7b3929eeaa6c9ba8be52a10d195955060ff0b8b8c13671d533d26ff27fb13de2
SIZE (go-yaml-yaml-v2.2.5_GH0.tar.gz) = 72259
SHA256 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045
SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
SHA256 (golang-net-3b0461eec859_GH0.tar.gz) = a22a8864fdc90a79d953afad48ec799386daee4bfe93ecc50ccca4b77c2a9329
SIZE (golang-net-3b0461eec859_GH0.tar.gz) = 1099281
SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
@ -81,7 +81,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137
SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460
SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3
SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655
SHA256 (gitlab-org-gitaly-f63adf19271e150a338eb90479b7afeb94340ed9_GL0.tar.gz) = 62ad342b1ac90be8cde184383129716b7c931511f90100422566a31ac0d87dd5
SIZE (gitlab-org-gitaly-f63adf19271e150a338eb90479b7afeb94340ed9_GL0.tar.gz) = 2847447
SHA256 (gitlab-org-gitaly-61393768996e58bd5df436526cb46d5612ead584_GL0.tar.gz) = 9b1458bbf7264c6cc1b64ccfb71c64faa614b9d96550b76e40f3c88dee75731a
SIZE (gitlab-org-gitaly-61393768996e58bd5df436526cb46d5612ead584_GL0.tar.gz) = 2868702
SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149

4
devel/gitaly/files/patch-__support_Makefile.template
View File

@ -1,4 +1,4 @@
--- _support/Makefile.template.orig 2019-09-29 09:26:06 UTC
--- _support/Makefile.template.orig 2020-02-21 15:02:16 UTC
+++ _support/Makefile.template
@@ -8,7 +8,7 @@
# These variables may be overridden at runtime by top-level make
@ -9,7 +9,7 @@
ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly
BUILD_TAGS := tracer_static tracer_static_jaeger
@@ -55,8 +55,8 @@ build: ../.ruby-bundle
@@ -56,8 +56,8 @@ build: ../.ruby-bundle
# step. Both Omnibus and CNG assume it is in the Gitaly root, not in
# _build. Hence the '../' in front.
../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile

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

@ -1,14 +1,14 @@
--- ruby/Gemfile.orig 2020-02-01 09:18:38 UTC
--- ruby/Gemfile.orig 2020-02-21 15:02:16 UTC
+++ ruby/Gemfile
@@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12'
gem 'rbtrace', require: false
# Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.5.0'
+gem 'gitlab-labkit', '~> 0.8.0'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
@@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 7.5', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.0'
-gem 'activesupport', '6.0.2'
+gem 'activesupport', '6.0.2.1'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false
gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
gem 'google-protobuf', '~> 3.8.0'

4
devel/gitaly/pkg-plist
View File

@ -11,7 +11,6 @@
%%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml
%%DATADIR%%/ruby/gitlab-shell/CHANGELOG
%%DATADIR%%/ruby/gitlab-shell/CONTRIBUTING.md
%%DATADIR%%/ruby/gitlab-shell/Gemfile
%%DATADIR%%/ruby/gitlab-shell/LICENSE
%%DATADIR%%/ruby/gitlab-shell/README.md
%%DATADIR%%/ruby/gitlab-shell/README.orig.md
@ -84,9 +83,9 @@
%%DATADIR%%/ruby/lib/gitaly_server.rb
%%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb
%%DATADIR%%/ruby/lib/gitaly_server/client.rb
%%DATADIR%%/ruby/lib/gitaly_server/commit_service.rb
%%DATADIR%%/ruby/lib/gitaly_server/conflicts_service.rb
%%DATADIR%%/ruby/lib/gitaly_server/exception_sanitizer_interceptor.rb
%%DATADIR%%/ruby/lib/gitaly_server/feature_flags.rb
%%DATADIR%%/ruby/lib/gitaly_server/health_service.rb
%%DATADIR%%/ruby/lib/gitaly_server/operations_service.rb
%%DATADIR%%/ruby/lib/gitaly_server/ref_service.rb
@ -185,6 +184,7 @@
%%DATADIR%%/ruby/spec/gitaly/remote_service_spec.rb
%%DATADIR%%/ruby/spec/gitaly/repository_service_spec.rb
%%DATADIR%%/ruby/spec/lib/gitaly_server/exception_sanitizer_interceptor_spec.rb
%%DATADIR%%/ruby/spec/lib/gitaly_server/feature_flags_spec.rb
%%DATADIR%%/ruby/spec/lib/gitaly_server/rugged_interceptor_spec.rb
%%DATADIR%%/ruby/spec/lib/gitaly_server/utils_spec.rb
%%DATADIR%%/ruby/spec/lib/gitaly_server/sentry/url_sanitizer_spec.rb