svn commit: r524829 - in head/devel/gitaly: . files
Matthias Fechner
mfechner at FreeBSD.org
Sun Feb 2 08:30:42 UTC 2020
Author: mfechner
Date: Sun Feb 2 08:30:41 2020
New Revision: 524829
URL: https://svnweb.freebsd.org/changeset/ports/524829
Log:
Update to 1.83.0 which is required for gitlab-ce 12.7.
Modified:
head/devel/gitaly/Makefile
head/devel/gitaly/distinfo
head/devel/gitaly/files/patch-ruby_Gemfile
head/devel/gitaly/pkg-plist
Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile Sun Feb 2 08:29:53 2020 (r524828)
+++ head/devel/gitaly/Makefile Sun Feb 2 08:30:41 2020 (r524829)
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= gitaly
-DISTVERSION= 1.77.0
-PORTREVISION= 1
+DISTVERSION= 1.83.0
+PORTREVISION= 0
CATEGORIES= devel
MAINTAINER= mfechner at FreeBSD.org
@@ -18,14 +18,14 @@ MY_DEPENDS= git>=2.21:devel/git \
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-rdoc>=6.0<7.0:devel/rubygem-rdoc \
+ 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 \
rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \
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.5.0<0.6.0:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.8.0<0.9.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= a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83
+GL_COMMIT= f63adf19271e150a338eb90479b7afeb94340ed9
# for go dependencies
USE_GITHUB= nodefault
@@ -56,11 +56,11 @@ GH_TUPLE= \
codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \
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-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
- golang:crypto:4def268fd1a4:golang_crypto/vendor/golang.org/x/crypto \
- golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
+ 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 \
+ golang:net:3b0461eec859:golang_net/vendor/golang.org/x/net \
golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
- golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
+ golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
golang:sys:fde4db37ae7a:golang_sys/vendor/golang.org/x/sys \
golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \
@@ -82,15 +82,15 @@ GH_TUPLE= \
prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \
prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \
prometheus:procfs:v0.0.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
+ rubenv:sql-migrate:06338513c237:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \
sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \
- sirupsen:logrus:v1.3.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+ sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \
tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \
uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \
uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib
-GL_TUPLE= \
- gitlab-org:labkit:3253d7975ca73714779c0a1fc95a27fb678071b6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
+GL_TUPLE= gitlab-org:labkit:3253d7975ca73714779c0a1fc95a27fb678071b6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
@@ -108,4 +108,3 @@ do-install:
cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby
.include <bsd.port.mk>
-
Modified: head/devel/gitaly/distinfo
==============================================================================
--- head/devel/gitaly/distinfo Sun Feb 2 08:29:53 2020 (r524828)
+++ head/devel/gitaly/distinfo Sun Feb 2 08:30:41 2020 (r524829)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1576925243
+TIMESTAMP = 1580548863
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
@@ -15,16 +15,16 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
SHA256 (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 16907c25fc86802614579a6a8e638fe4bd65ba2c07a18ff5185de14e75bd878f
SIZE (getsentry-sentry-go-v0.3.0_GH0.tar.gz) = 57823
-SHA256 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff
-SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656
-SHA256 (golang-crypto-4def268fd1a4_GH0.tar.gz) = eaf2ba9df95911f41a340478d1fbb540d7bc21939e4688273995dabf58e8c7b0
-SIZE (golang-crypto-4def268fd1a4_GH0.tar.gz) = 1693117
-SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4
-SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
+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 (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
SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
+SHA256 (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 00a6dce4c1a9ca9edae6c3f1bedc0b15911c62681371ad9ed7738e182ba70393
+SIZE (golang-sync-cd5d95a43a6e_GH0.tar.gz) = 16956
SHA256 (golang-sys-fde4db37ae7a_GH0.tar.gz) = b6aab4e92d5d8fe85ca0dd229bfb75c91290951a3bf3b95087459e5a4eae86a4
SIZE (golang-sys-fde4db37ae7a_GH0.tar.gz) = 1455218
SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
@@ -67,10 +67,12 @@ SHA256 (prometheus-common-v0.4.1_GH0.tar.gz) = 99229ef
SIZE (prometheus-common-v0.4.1_GH0.tar.gz) = 98631
SHA256 (prometheus-procfs-v0.0.3_GH0.tar.gz) = 3af9b805166932b771dfa19a4c94eb83ceefd2eb54d1a314c3bf15a5f3154d0d
SIZE (prometheus-procfs-v0.0.3_GH0.tar.gz) = 91880
+SHA256 (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 922ed3e65f2fa3ad337259253b541204de5448eeb2a1db6d5361419204dd8e67
+SIZE (rubenv-sql-migrate-06338513c237_GH0.tar.gz) = 29603
SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e148324eff67b69524b0ef766d64050d9e3
SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000
-SHA256 (sirupsen-logrus-v1.3.0_GH0.tar.gz) = f80cfa34148c4e25c4d3030edb1fd9878d666eca7e900f1aaf0d87c67ecabe51
-SIZE (sirupsen-logrus-v1.3.0_GH0.tar.gz) = 38452
+SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
+SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
SHA256 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698
SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085
SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570
@@ -79,7 +81,7 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b
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-a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83_GL0.tar.gz) = 311ab47d3821f29f72f0aa9a02dd816d1f65b1c95060d5217e3e6db5f5106bd0
-SIZE (gitlab-org-gitaly-a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83_GL0.tar.gz) = 2828538
+SHA256 (gitlab-org-gitaly-f63adf19271e150a338eb90479b7afeb94340ed9_GL0.tar.gz) = 62ad342b1ac90be8cde184383129716b7c931511f90100422566a31ac0d87dd5
+SIZE (gitlab-org-gitaly-f63adf19271e150a338eb90479b7afeb94340ed9_GL0.tar.gz) = 2847447
SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c
SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149
Modified: head/devel/gitaly/files/patch-ruby_Gemfile
==============================================================================
--- head/devel/gitaly/files/patch-ruby_Gemfile Sun Feb 2 08:29:53 2020 (r524828)
+++ head/devel/gitaly/files/patch-ruby_Gemfile Sun Feb 2 08:30:41 2020 (r524829)
@@ -1,5 +1,14 @@
---- ruby/Gemfile.orig 2019-11-22 14:21:07 UTC
+--- ruby/Gemfile.orig 2020-02-01 09:18:38 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
@@ -24,17 +24,3 @@ gem 'licensee', '~> 8.9.0'
gem 'google-protobuf', '~> 3.8.0'
@@ -14,7 +23,7 @@
-
- # gitlab-shell spec gems
- gem 'listen', '~> 0.5.0'
-- gem 'simplecov', '~> 0.9.0', require: false
+- gem 'simplecov', '~> 0.17.1', require: false
- gem 'vcr', '~> 4.0.0'
- gem 'webmock', '~> 3.4.0'
-end
Modified: head/devel/gitaly/pkg-plist
==============================================================================
--- head/devel/gitaly/pkg-plist Sun Feb 2 08:29:53 2020 (r524828)
+++ head/devel/gitaly/pkg-plist Sun Feb 2 08:30:41 2020 (r524829)
@@ -119,6 +119,7 @@
%%DATADIR%%/ruby/lib/gitlab/git/operation_service.rb
%%DATADIR%%/ruby/lib/gitlab/git/path_helper.rb
%%DATADIR%%/ruby/lib/gitlab/git/popen.rb
+%%DATADIR%%/ruby/lib/gitlab/git/push_options.rb
%%DATADIR%%/ruby/lib/gitlab/git/ref.rb
%%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb
%%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb
@@ -198,6 +199,7 @@
%%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/lfs_changes_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/popen_spec.rb
+%%DATADIR%%/ruby/spec/lib/gitlab/git/push_options_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/remote_mirror_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_client_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/remote_repository_spec.rb
@@ -213,6 +215,7 @@
%%DATADIR%%/ruby/spec/lib/gitlab/git/user_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/wiki_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/git/worktree_spec.rb
+%%DATADIR%%/ruby/spec/lib/gitlab/git_spec.rb
%%DATADIR%%/ruby/spec/lib/gitlab/ref_matcher_spec.rb
%%DATADIR%%/ruby/spec/spec_helper.rb
%%DATADIR%%/ruby/spec/support/generate-seed-repo-rb
More information about the svn-ports-all
mailing list