From owner-svn-ports-all@freebsd.org Sat Mar 28 09:06:07 2020 Return-Path: Delivered-To: svn-ports-all@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 14AAA2757C6; Sat, 28 Mar 2020 09:06:07 +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 48qCWK1l4Lz3Mp7; Sat, 28 Mar 2020 09:06:04 +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 A0E859E1D; Sat, 28 Mar 2020 09:05:59 +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 02S95xOX054486; Sat, 28 Mar 2020 09:05:59 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02S95wsZ054477; Sat, 28 Mar 2020 09:05:58 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202003280905.02S95wsZ054477@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 28 Mar 2020 09:05:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529321 - 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: 529321 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Mar 2020 09:06:07 -0000 Author: mfechner Date: Sat Mar 28 09:05:58 2020 New Revision: 529321 URL: https://svnweb.freebsd.org/changeset/ports/529321 Log: Update to 12.9.1 which is required for gitlab-ce 12.9 upgrade. Added: head/devel/gitaly/files/patch-__support_makegen.go (contents, props changed) Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-__support_Makefile.template head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Sat Mar 28 09:05:24 2020 (r529320) +++ head/devel/gitaly/Makefile Sat Mar 28 09:05:58 2020 (r529321) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 12.8.8 +DISTVERSION= 12.9.1 PORTREVISION= 0 CATEGORIES= devel @@ -19,13 +19,13 @@ MY_DEPENDS= git>=2.22:devel/git \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ 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-lib>=4.2.7.8<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.9.1<0.10.0:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit=0.11.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,16 +41,17 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= dfdd27bf0ca54f6804263a10d233a332eb2a7b40 +GL_COMMIT= 831b5f14fb0b74bba463622feca43000325ffa36 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 44dd +# 52dd GH_TUPLE= \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ + census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \ cloudflare:tableflip:8392f1641731:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \ codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \ @@ -58,13 +59,20 @@ GH_TUPLE= \ 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.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - golang:net:3b0461eec859:golang_net/vendor/golang.org/x/net \ + golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \ + golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \ + golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \ + golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \ - golang:sys:fde4db37ae7a:golang_sys/vendor/golang.org/x/sys \ + golang:sys:86b910548bc1: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 \ + google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ + google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \ + googleapis:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go/v2 \ + googleapis:google-api-go-client:v0.15.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ + googleapis:google-cloud-go:v0.50.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ 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.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \ @@ -79,7 +87,7 @@ GH_TUPLE= \ pkg:errors:v0.8.1: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: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:client_model:14fe0d1b01d4: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 \ @@ -90,7 +98,7 @@ GH_TUPLE= \ 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:9cb7801f7feafecc53f5a061ffeae5c11567da9b: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 Sat Mar 28 09:05:24 2020 (r529320) +++ head/devel/gitaly/distinfo Sat Mar 28 09:05:58 2020 (r529321) @@ -1,10 +1,12 @@ -TIMESTAMP = 1585254521 +TIMESTAMP = 1585344519 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 SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 +SHA256 (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 0aa930142b669d7c47e2b8343f6adc9f03414a9c45763c5f746de95231d6ad6d +SIZE (census-instrumentation-opencensus-go-v0.22.2_GH0.tar.gz) = 165321 SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875 SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283 SHA256 (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 0fab510fb61d488f63c59485dadb166d7d5fac5ebbd65e6a3cacfc9fdd1fb6d3 @@ -19,20 +21,34 @@ SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4b SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726 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-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316 +SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903 +SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70 +SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040 +SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d +SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285 +SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8 +SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 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-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49 +SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522 SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 -SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377 -SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775 +SHA256 (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 06778b867759fad0b06fac4067911e616184aa40061cbd37cffaa950399ad7d4 +SIZE (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 5960232 +SHA256 (google-pprof-d4f498aebedc_GH0.tar.gz) = 996b1f210183d8541a3a3cf22a2045396e4473cb92123c1b13613c0726a7bb76 +SIZE (google-pprof-d4f498aebedc_GH0.tar.gz) = 1145078 SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423 SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543 +SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c +SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328 +SHA256 (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 6d628266b507a71f26ce2fd426758e1241f9dd94458752d9d12a0b09da983844 +SIZE (googleapis-google-api-go-client-v0.15.0_GH0.tar.gz) = 13259795 +SHA256 (googleapis-google-cloud-go-v0.50.0_GH0.tar.gz) = 8227c310b0059f9b1eb2ca16e9cebb3550272b929aaa1de7039a47d353ab8a18 +SIZE (googleapis-google-cloud-go-v0.50.0_GH0.tar.gz) = 2410793 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 @@ -61,8 +77,8 @@ SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 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-client_model-14fe0d1b01d4_GH0.tar.gz) = e86922566dae5bd684e2b77baabfaee9df34ce11cd7c8bae688b512b3a496f03 +SIZE (prometheus-client_model-14fe0d1b01d4_GH0.tar.gz) = 57495 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.3_GH0.tar.gz) = 3af9b805166932b771dfa19a4c94eb83ceefd2eb54d1a314c3bf15a5f3154d0d @@ -81,7 +97,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-dfdd27bf0ca54f6804263a10d233a332eb2a7b40_GL0.tar.gz) = 742feab7d4edfc19c6f549cb51aa222c24484a2a5e78ab0d7c8e5c4061ccfaae -SIZE (gitlab-org-gitaly-dfdd27bf0ca54f6804263a10d233a332eb2a7b40_GL0.tar.gz) = 2869042 -SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c -SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149 +SHA256 (gitlab-org-gitaly-831b5f14fb0b74bba463622feca43000325ffa36_GL0.tar.gz) = af661d4430027e2e33c24ef7154932f6ca7187ba8b4a40ac66cfcdc26c2518e9 +SIZE (gitlab-org-gitaly-831b5f14fb0b74bba463622feca43000325ffa36_GL0.tar.gz) = 2909466 +SHA256 (gitlab-org-labkit-9cb7801f7feafecc53f5a061ffeae5c11567da9b_GL0.tar.gz) = 03473dec168ecb298a1733fc8b5016f1e09f47214b5080dc4986dda73227788b +SIZE (gitlab-org-labkit-9cb7801f7feafecc53f5a061ffeae5c11567da9b_GL0.tar.gz) = 3619617 Modified: head/devel/gitaly/files/patch-__support_Makefile.template ============================================================================== --- head/devel/gitaly/files/patch-__support_Makefile.template Sat Mar 28 09:05:24 2020 (r529320) +++ head/devel/gitaly/files/patch-__support_Makefile.template Sat Mar 28 09:05:58 2020 (r529321) @@ -1,14 +1,5 @@ ---- _support/Makefile.template.orig 2020-02-21 15:02:16 UTC +--- _support/Makefile.template.orig 2020-03-26 12:14:05 UTC +++ _support/Makefile.template -@@ -8,7 +8,7 @@ - # These variables may be overridden at runtime by top-level make - PREFIX ?= /usr/local - INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ --BUNDLE_FLAGS ?= --deployment -+BUNDLE_FLAGS ?= --local - ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly - BUILD_TAGS := tracer_static tracer_static_jaeger - @@ -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. Added: head/devel/gitaly/files/patch-__support_makegen.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gitaly/files/patch-__support_makegen.go Sat Mar 28 09:05:58 2020 (r529321) @@ -0,0 +1,11 @@ +--- _support/makegen.go.orig 2020-03-27 21:35:27 UTC ++++ _support/makegen.go +@@ -339,7 +339,7 @@ func (gm *gitalyMake) BundleFlags() string { + return "--no-deployment" + } + +- return "--deployment" ++ return "--local" + } + + func (gm *gitalyMake) IsGDK() bool { Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 28 09:05:24 2020 (r529320) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 28 09:05:58 2020 (r529321) @@ -1,4 +1,4 @@ ---- ruby/Gemfile.orig 2020-02-21 15:02:16 UTC +--- ruby/Gemfile.orig 2020-03-26 12:14:07 UTC +++ ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' @@ -9,6 +9,15 @@ 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 +@@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' + gem 'rbtrace', require: false + + # Labkit provides observability functionality +-gem 'gitlab-labkit', '~> 0.9.1' ++gem 'gitlab-labkit', '~> 0.11.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' Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Sat Mar 28 09:05:24 2020 (r529320) +++ head/devel/gitaly/pkg-plist Sat Mar 28 09:05:58 2020 (r529321) @@ -88,7 +88,6 @@ %%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 %%DATADIR%%/ruby/lib/gitaly_server/remote_service.rb %%DATADIR%%/ruby/lib/gitaly_server/repository_service.rb %%DATADIR%%/ruby/lib/gitaly_server/rugged_interceptor.rb @@ -119,6 +118,7 @@ %%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/push_results.rb %%DATADIR%%/ruby/lib/gitlab/git/ref.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_mirror.rb %%DATADIR%%/ruby/lib/gitlab/git/remote_repository.rb @@ -153,6 +153,9 @@ %%DATADIR%%/ruby/proto/gitaly/diff_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/hook_pb.rb %%DATADIR%%/ruby/proto/gitaly/hook_services_pb.rb +%%DATADIR%%/ruby/proto/gitaly/internal_pb.rb +%%DATADIR%%/ruby/proto/gitaly/internal_services_pb.rb +%%DATADIR%%/ruby/proto/gitaly/lint_pb.rb %%DATADIR%%/ruby/proto/gitaly/namespace_pb.rb %%DATADIR%%/ruby/proto/gitaly/namespace_services_pb.rb %%DATADIR%%/ruby/proto/gitaly/objectpool_pb.rb @@ -180,7 +183,6 @@ %%DATADIR%%/ruby/spec/factories/gitaly/commit.rb %%DATADIR%%/ruby/spec/factories/gitaly/commit_author.rb %%DATADIR%%/ruby/spec/factories/sequences.rb -%%DATADIR%%/ruby/spec/gitaly/ref_service_spec.rb %%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 @@ -200,9 +202,11 @@ %%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/push_results_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 +%%DATADIR%%/ruby/spec/lib/gitlab/git/repository_mirroring_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/repository_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/rev_list_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/ssh_auth_spec.rb