From owner-svn-ports-head@freebsd.org Fri Aug 30 07:37:22 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E1405C5989; Fri, 30 Aug 2019 07:37:22 +0000 (UTC) (envelope-from mfechner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46KWXL5fwzz3Jq5; Fri, 30 Aug 2019 07:37:22 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8A81E2CDB9; Fri, 30 Aug 2019 07:37:22 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7U7bMdN026682; Fri, 30 Aug 2019 07:37:22 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7U7bLld026678; Fri, 30 Aug 2019 07:37:21 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201908300737.x7U7bLld026678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 30 Aug 2019 07:37:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510251 - in head/devel/gitaly: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/devel/gitaly: . files X-SVN-Commit-Revision: 510251 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Aug 2019 07:37:22 -0000 Author: mfechner Date: Fri Aug 30 07:37:21 2019 New Revision: 510251 URL: https://svnweb.freebsd.org/changeset/ports/510251 Log: devel/gitaly: update to 1.53.3 which is required for gitlab-ce 12.1. Deleted: head/devel/gitaly/files/patch-pr1344.diff Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-config.toml.example head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Fri Aug 30 07:35:29 2019 (r510250) +++ head/devel/gitaly/Makefile Fri Aug 30 07:37:21 2019 (r510251) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.47.2 +DISTVERSION= 1.53.3 PORTREVISION= 0 CATEGORIES= devel @@ -17,7 +17,7 @@ MY_DEPENDS= git>=2.21:devel/git \ rubygem-rugged>=0.28.0:devel/rubygem-rugged \ rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \ - rubygem-activesupport5>=5.1.7:devel/rubygem-activesupport5 \ + rubygem-activesupport52>=5.2.3:devel/rubygem-activesupport52 \ rubygem-gitaly-proto>=1.32.0:net/rubygem-gitaly-proto \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \ @@ -42,7 +42,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= abb937e08c36f0cb89e57eca3038364c44e435c7 +GL_COMMIT= 37b71fbdfe4375bb8eaf64f855f1182caf066ec7 # for go dependencies USE_GITHUB= nodefault @@ -57,12 +57,13 @@ GH_TUPLE= \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \ golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \ - golang:net:d8887717615a:golang_net/vendor/golang.org/x/net \ + golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:37e7f081c4d4:golang_sync/vendor/golang.org/x/sync \ golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \ + google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ grpc:grpc-go:v1.16.0:grpc_grpc_go/vendor/google.golang.org/grpc \ @@ -75,18 +76,19 @@ GH_TUPLE= \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \ pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ - prometheus:client_golang:v0.9.3:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_golang:v1.0.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \ - prometheus:common:v0.4.0:prometheus_common/vendor/github.com/prometheus/common \ - prometheus:procfs:5867b95ac084:prometheus_procfs/vendor/github.com/prometheus/procfs \ + prometheus:common:v0.4.1:prometheus_common/vendor/github.com/prometheus/common \ + prometheus:procfs:v0.0.2:prometheus_procfs/vendor/github.com/prometheus/procfs \ sirupsen:logrus:v1.2.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \ + stretchr:testify:v1.3.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:gitaly-proto:f4db5d05d437abe1154d7308ca044d3577b5ccba:gitlab_org_gitaly_proto/vendor/gitlab.com/gitlab-org/gitaly-proto \ + gitlab-org:gitaly-proto:f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553:gitlab_org_gitaly_proto/vendor/gitlab.com/gitlab-org/gitaly-proto \ gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit + post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Fri Aug 30 07:35:29 2019 (r510250) +++ head/devel/gitaly/distinfo Fri Aug 30 07:37:21 2019 (r510251) @@ -1,4 +1,4 @@ -TIMESTAMP = 1565697512 +TIMESTAMP = 1566042205 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-raven-go-v0.1.2_GH0.tar.gz) = fe603d SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314 SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817 -SHA256 (golang-net-d8887717615a_GH0.tar.gz) = 275e6ecfc70b51e05127339c58d0ded3db9b74bf8be869d32c4e731b154af71d -SIZE (golang-net-d8887717615a_GH0.tar.gz) = 974014 +SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4 +SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062 SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884 SHA256 (golang-sync-37e7f081c4d4_GH0.tar.gz) = d0f0ce92264903fa32032fc365c0c0d36d129fa282d74364c406179a94714f10 @@ -29,6 +29,8 @@ SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345b SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377 SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775 +SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423 +SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 @@ -53,27 +55,27 @@ SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e49091 SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 -SHA256 (prometheus-client_golang-v0.9.3_GH0.tar.gz) = 691646522cee404fc8d48bf830309bb75e7b36ceca31d8dc2febe142e66a9ca8 -SIZE (prometheus-client_golang-v0.9.3_GH0.tar.gz) = 138415 +SHA256 (prometheus-client_golang-v1.0.0_GH0.tar.gz) = afee7b61a77342cc24ea55e284d08688267efca1843e529a51799fe52c5ee662 +SIZE (prometheus-client_golang-v1.0.0_GH0.tar.gz) = 138046 SHA256 (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 17571c708bab9a1ba18d9dd0c9bfe96dff3f1b84c63e7d8d4c3489ef5c34ee40 SIZE (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 57491 -SHA256 (prometheus-common-v0.4.0_GH0.tar.gz) = 5fbad5f7332e40e1e1a75da389e81cf51300c26efff8dfe894eb814d2db5062e -SIZE (prometheus-common-v0.4.0_GH0.tar.gz) = 98312 -SHA256 (prometheus-procfs-5867b95ac084_GH0.tar.gz) = e7a790683185905621d3ea93fc605a38957b3a5e4a16ff90dee557d2e714c842 -SIZE (prometheus-procfs-5867b95ac084_GH0.tar.gz) = 72672 +SHA256 (prometheus-common-v0.4.1_GH0.tar.gz) = 99229ef4b100e55d1e6496995f1a1af6813426b8820521bc041340eb077985b9 +SIZE (prometheus-common-v0.4.1_GH0.tar.gz) = 98631 +SHA256 (prometheus-procfs-v0.0.2_GH0.tar.gz) = ad1d1f1328a1c394b30225b939ed39482ba54de7be70d439c0555d68857457d5 +SIZE (prometheus-procfs-v0.0.2_GH0.tar.gz) = 78550 SHA256 (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 679aa05d23ca81b74f1327e7a25267a322dc9fd807a276e73e781f62ee679c6d SIZE (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 37794 -SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f -SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 +SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5 +SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859 SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570 SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923 SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94 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-abb937e08c36f0cb89e57eca3038364c44e435c7_GL0.tar.gz) = ad282f8c6480e342b15a1cc9990661adf7d752b89f682d081c876c1c28b8bde3 -SIZE (gitlab-org-gitaly-abb937e08c36f0cb89e57eca3038364c44e435c7_GL0.tar.gz) = 2063705 -SHA256 (gitlab-org-gitaly-proto-f4db5d05d437abe1154d7308ca044d3577b5ccba_GL0.tar.gz) = 5f716dae8d3085eeff97bb1df5d8078c7194b589e63a442126eebcf8c56c64a2 -SIZE (gitlab-org-gitaly-proto-f4db5d05d437abe1154d7308ca044d3577b5ccba_GL0.tar.gz) = 177233 +SHA256 (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = c069342eb5d1b87fb5bdc5876ede1157c04ec5de0501628813a95c02f2dd34ac +SIZE (gitlab-org-gitaly-37b71fbdfe4375bb8eaf64f855f1182caf066ec7_GL0.tar.gz) = 2097542 +SHA256 (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 20befa9ab47936d6a83fd362f5609d293dd4f6a3cb49d5b0049f6c8d6434810a +SIZE (gitlab-org-gitaly-proto-f5d7f3cf76555acb5a14ae80eb7db4ad9ff2c553_GL0.tar.gz) = 178864 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 Modified: head/devel/gitaly/files/patch-config.toml.example ============================================================================== --- head/devel/gitaly/files/patch-config.toml.example Fri Aug 30 07:35:29 2019 (r510250) +++ head/devel/gitaly/files/patch-config.toml.example Fri Aug 30 07:37:21 2019 (r510251) @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2019-06-18 09:53:31 UTC +--- config.toml.example.orig 2019-07-11 10:11:31 UTC +++ config.toml.example @@ -1,9 +1,9 @@ # Example Gitaly configuration file @@ -29,7 +29,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -56,7 +56,7 @@ path = "/home/git/repositories" +@@ -58,7 +58,7 @@ dir = "/home/git/gitlab/log" [gitaly-ruby] # The directory where gitaly-ruby is installed @@ -38,7 +38,7 @@ # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -72,7 +72,7 @@ dir = "/home/git/gitaly/ruby" +@@ -74,7 +74,7 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Fri Aug 30 07:35:29 2019 (r510250) +++ head/devel/gitaly/files/patch-ruby_Gemfile Fri Aug 30 07:37:21 2019 (r510251) @@ -1,10 +1,14 @@ ---- ruby/Gemfile.orig 2019-06-18 09:53:31 UTC +--- ruby/Gemfile.orig 2019-07-11 10:11:31 UTC +++ ruby/Gemfile -@@ -8,7 +8,7 @@ gem 'github-linguist', '~> 6.1', require: 'linguist' +@@ -6,9 +6,9 @@ gem 'bundler', '>= 1.17.3' + gem 'rugged', '~> 0.28' + gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' - gem 'activesupport', '~> 5.1.7' - gem 'gitaly-proto', '~> 1.32.0' +-gem 'activesupport', '~> 5.1.7' +-gem 'gitaly-proto', '~> 1.36.0' -gem 'rdoc', '~> 4.2' ++gem 'activesupport', '~> 5.2.3' ++gem 'gitaly-proto', '~> 1.37.0' +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 Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Fri Aug 30 07:35:29 2019 (r510250) +++ head/devel/gitaly/pkg-plist Fri Aug 30 07:37:21 2019 (r510251) @@ -19,6 +19,7 @@ %%DATADIR%%/ruby/gitlab-shell/README.orig.md %%DATADIR%%/ruby/gitlab-shell/VERSION %%DATADIR%%/ruby/gitlab-shell/bin/check +%%DATADIR%%/ruby/gitlab-shell/bin/dump-config %%DATADIR%%/ruby/gitlab-shell/bin/test-logger %%DATADIR%%/ruby/gitlab-shell/config.yml.example %%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access.rb @@ -135,6 +136,7 @@ %%DATADIR%%/ruby/lib/gitlab/git/wiki_file.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page.rb %%DATADIR%%/ruby/lib/gitlab/git/wiki_page_version.rb +%%DATADIR%%/ruby/lib/gitlab/git/worktree.rb %%DATADIR%%/ruby/lib/gitlab/git_logger.rb %%DATADIR%%/ruby/lib/gitlab/gollum.rb %%DATADIR%%/ruby/lib/gitlab/rails_logger.rb @@ -175,6 +177,7 @@ %%DATADIR%%/ruby/spec/lib/gitlab/git/testdata/gitalycert.pem %%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/ref_matcher_spec.rb %%DATADIR%%/ruby/spec/spec_helper.rb %%DATADIR%%/ruby/spec/support/generate-seed-repo-rb