Date: Sat, 28 Nov 2020 14:58:25 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556496 - in head/devel/gitaly: . files Message-ID: <202011281458.0ASEwPPS006369@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sat Nov 28 14:58:25 2020 New Revision: 556496 URL: https://svnweb.freebsd.org/changeset/ports/556496 Log: Update to 13.6.0 which is required for gitlab-ce 13.6. Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-Makefile head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Sat Nov 28 14:58:16 2020 (r556495) +++ head/devel/gitaly/Makefile Sat Nov 28 14:58:25 2020 (r556496) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.5.4 +DISTVERSION= 13.6.0 PORTREVISION= 0 CATEGORIES= devel @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.28:devel/git \ - rubygem-bundler>=1.17.3:sysutils/rubygem-bundler \ +MY_DEPENDS= git>=2.29:devel/git \ + rubygem-bundler>=2.1.4:sysutils/rubygem-bundler \ rubygem-rugged>=0.28:devel/rubygem-rugged \ rubygem-github-linguist>=7.11<8.0:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ @@ -25,7 +25,7 @@ MY_DEPENDS= git>=2.28:devel/git \ rubygem-sentry-raven>=3.0<4:devel/rubygem-sentry-raven \ rubygem-faraday>=1.0.1<2:www/rubygem-faraday \ rubygem-rbtrace>=0.4.14:devel/rubygem-rbtrace \ - rubygem-gitlab-labkit>=0.12.1<0.13:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.13.2<0.14:devel/rubygem-gitlab-labkit \ rubygem-licensee8>=8.9.0<8.10.0:devel/rubygem-licensee8 \ rubygem-google-protobuf>=3.12.0<4:devel/rubygem-google-protobuf BUILD_DEPENDS= gem:devel/ruby-gems \ @@ -43,12 +43,12 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 17bea8a2e504e3ef94101fe8c9356c7e406c988e +GL_COMMIT= 22221d4a96e129209eea3e876e50209a87dd40e7 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 74dd +# 76dd GH_TUPLE= \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ alexbrainman:sspi:4729b3d4d858:alexbrainman_sspi/vendor/github.com/alexbrainman/sspi \ @@ -60,13 +60,14 @@ GH_TUPLE= \ HdrHistogram:hdrhistogram-go:3a0bb77429bd:codahale_hdrhistogram_go/vendor/github.com/codahale/hdrhistogram \ davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ dpotapov:go-spnego:c2c609116ad0:dpotapov_go_spnego/vendor/github.com/dpotapov/go-spnego \ - getsentry:sentry-go:v0.5.1:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \ + getsentry:sentry-go:v0.7.0:getsentry_sentry_go/vendor/github.com/getsentry/sentry-go \ git-lfs:git-lfs:9ea4eed5b112:git_lfs_git_lfs/vendor/github.com/git-lfs/git-lfs \ git-lfs:gitobj:v2.0.0:git_lfs_gitobj_v2/vendor/github.com/git-lfs/gitobj/v2 \ git-lfs:go-netrc:e0e9ca483a18:git_lfs_go_netrc/vendor/github.com/git-lfs/go-netrc \ git-lfs:go-ntlm:c5056e7fa066:git_lfs_go_ntlm/vendor/github.com/git-lfs/go-ntlm \ git-lfs:wildmatch:v1.0.4:git_lfs_wildmatch/vendor/github.com/git-lfs/wildmatch \ go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \ + go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \ go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \ golang:crypto:5c72a883971a:golang_crypto/vendor/golang.org/x/crypto \ @@ -75,7 +76,7 @@ GH_TUPLE= \ golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:6e8e738ad208:golang_sync/vendor/golang.org/x/sync \ - golang:sys:af09f7315aff:golang_sys/vendor/golang.org/x/sys \ + golang:sys:e3ed0017c211:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \ google:go-genproto:ca5a22157cba:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:d4f498aebedc:google_pprof/vendor/github.com/google/pprof \ @@ -93,16 +94,16 @@ GH_TUPLE= \ jcmturner:gokrb5:v5.3.0:jcmturner_gokrb5/vendor/gopkg.in/jcmturner/gokrb5.v5 \ jcmturner:rpc:v0.0.2:jcmturner_rpc/vendor/gopkg.in/jcmturner/rpc.v0 \ kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ - konsorten:go-windows-terminal-sequences:v1.0.3:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ lib:pq:v1.2.0:lib_pq/vendor/github.com/lib/pq \ libgit2:git2go:v30.0.5:libgit2_git2go_v30/vendor/github.com/libgit2/git2go/v30 \ lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \ mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + oklog:ulid:v2.0.2:oklog_ulid_v2/vendor/github.com/oklog/ulid/v2 \ olekukonko:tablewriter:v0.0.2:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ olekukonko:ts:78ecb04241c0:olekukonko_ts/vendor/github.com/olekukonko/ts \ - opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ + opentracing:opentracing-go:v1.2.0:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ pelletier:go-toml:v1.8.1:pelletier_go_toml/vendor/github.com/pelletier/go-toml \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \ @@ -114,21 +115,20 @@ GH_TUPLE= \ rubenv:sql-migrate:06338513c237:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \ rubyist:tracerx:787959303086:rubyist_tracerx/vendor/github.com/rubyist/tracerx \ sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \ - sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ + sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ ssgelm:cookiejarparser:v1.0.1:ssgelm_cookiejarparser/vendor/github.com/ssgelm/cookiejarparser \ - stretchr:testify:v1.5.1:stretchr_testify/vendor/github.com/stretchr/testify \ + stretchr:objx:v0.1.1:stretchr_objx/vendor/github.com/stretchr/objx \ + stretchr:testify:v1.6.1: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:gitlab-shell:1a2bfecd2f0ebb8e31f9833e0522c4643797041b:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ - gitlab-org:labkit:45895e1290291a2519678a847a24edb22880b9e6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit +GL_TUPLE= gitlab-org:gitlab-shell:3f9890ef73dced430d86801a1efc0e93ec50890e:gitlab_org_gitlab_shell/vendor/gitlab.com/gitlab-org/gitlab-shell \ + gitlab-org:labkit:40dcf811328cfe956de0d89ed9276a9d4f35eddd:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/ruby/gitlab-shell/config.yml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample - ${MV} ${WRKSRC}/ruby/gitlab-shell/config.yml.example ${WRKSRC}/ruby/gitlab-shell/config.yml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Sat Nov 28 14:58:16 2020 (r556495) +++ head/devel/gitaly/distinfo Sat Nov 28 14:58:25 2020 (r556496) @@ -1,4 +1,4 @@ -TIMESTAMP = 1605706287 +TIMESTAMP = 1605919298 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 (alexbrainman-sspi-4729b3d4d858_GH0.tar.gz) = 757930d82a7fca04d46d1c69ac27361ef2dadcb9fabbb3bf3a5ed785ebfc4e27 @@ -19,8 +19,8 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 8093037eed2321f7496b3f66a3396e798463a2bb7dbf7e8bf9b0b54bc7c20a97 SIZE (dpotapov-go-spnego-c2c609116ad0_GH0.tar.gz) = 4294 -SHA256 (getsentry-sentry-go-v0.5.1_GH0.tar.gz) = d2f980bebe15ef7685aa15bb788c67ce3a7b82220050871321d82cf9a90d2231 -SIZE (getsentry-sentry-go-v0.5.1_GH0.tar.gz) = 70280 +SHA256 (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = b5e7432442928e4b03f61d4cb97e5d0b815e6c8618fbf34aa6275aab2218b27e +SIZE (getsentry-sentry-go-v0.7.0_GH0.tar.gz) = 89499 SHA256 (git-lfs-git-lfs-9ea4eed5b112_GH0.tar.gz) = 0801cb7867005791509ce7e01cb1680ec5faa48e966135110ac559d4403e8a16 SIZE (git-lfs-git-lfs-9ea4eed5b112_GH0.tar.gz) = 2848559 SHA256 (git-lfs-gitobj-v2.0.0_GH0.tar.gz) = 77ff7ff8afa525e3ce5d99a9006755a2817f25ae6c6eeb1279b36b6513828792 @@ -33,6 +33,8 @@ SHA256 (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 03fb701 SIZE (git-lfs-wildmatch-v1.0.4_GH0.tar.gz) = 9580 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-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04 +SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898 SHA256 (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 42027002bf258009d498600b04b8c9cbb29d2193185ea7bfa8fefe194fe72a07 SIZE (go-yaml-yaml-v2.3.0_GH0.tar.gz) = 72816 SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316 @@ -49,8 +51,8 @@ SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda6228 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 SHA256 (golang-sync-6e8e738ad208_GH0.tar.gz) = 011eb5dc95a0ede8be5d68edde93be5af1b88d7fc098d0f74c6f7560beb378f0 SIZE (golang-sync-6e8e738ad208_GH0.tar.gz) = 17288 -SHA256 (golang-sys-af09f7315aff_GH0.tar.gz) = 42f744f4f5ce6019a7a52a5cfa417d4422bb054a397b3ca663151d3865b24e80 -SIZE (golang-sys-af09f7315aff_GH0.tar.gz) = 1063254 +SHA256 (golang-sys-e3ed0017c211_GH0.tar.gz) = 93c78dbd2d42098a1d6cbe483c5564d59d5a6eff470295aba1a1f6adf495d5e1 +SIZE (golang-sys-e3ed0017c211_GH0.tar.gz) = 1068415 SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185 SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332 SHA256 (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 06778b867759fad0b06fac4067911e616184aa40061cbd37cffaa950399ad7d4 @@ -85,8 +87,6 @@ SHA256 (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 61aeb3064e5 SIZE (jcmturner-rpc-v0.0.2_GH0.tar.gz) = 9128 SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec9fc320de81509f4aa582ea3b6ce18476c3e40dd SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408 -SHA256 (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3 -SIZE (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983 SHA256 (lib-pq-v1.2.0_GH0.tar.gz) = 052e9ce4472eda212e5034fd0298fcf254c22925b1d596b1d043a7a60fe4672e SIZE (lib-pq-v1.2.0_GH0.tar.gz) = 96083 SHA256 (libgit2-git2go-v30.0.5_GH0.tar.gz) = 114d374b81f8d6d342b3a426ee778e8836db4f3e9d002c26083c2b9576a1a973 @@ -99,12 +99,14 @@ SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2 SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827 SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 +SHA256 (oklog-ulid-v2.0.2_GH0.tar.gz) = d2b0dadd45201cd3385736bd5bd9c8c572e42249e713fe65dfb1e1df6870e3e3 +SIZE (oklog-ulid-v2.0.2_GH0.tar.gz) = 56670 SHA256 (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 07e3c6c6f36f6d6e5fc0aa5490f756a9d987e2f3ed20c74e1ec3805c027fd71d SIZE (olekukonko-tablewriter-v0.0.2_GH0.tar.gz) = 18831 SHA256 (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = e773762d9adb136c048e20f75f90ed3da9c4fd670c1798d26ef592b9aa4e44c7 SIZE (olekukonko-ts-78ecb04241c0_GH0.tar.gz) = 3173 -SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df -SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 +SHA256 (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = cb32b383422a9aae11d260657d52a3789bd799802881b9ced3ee82c370be6f76 +SIZE (opentracing-opentracing-go-v1.2.0_GH0.tar.gz) = 35914 SHA256 (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 837b8407fb401deff36961ce32498a1145c5ef4bad0b0060a25e632c14621941 SIZE (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 98819 SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff @@ -127,21 +129,23 @@ SHA256 (rubyist-tracerx-787959303086_GH0.tar.gz) = ab1 SIZE (rubyist-tracerx-787959303086_GH0.tar.gz) = 2833 SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e148324eff67b69524b0ef766d64050d9e3 SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000 -SHA256 (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 536151aa2fed39e2b74925f81c8cd31f0c02c013881ba2d30982731d12424ed0 -SIZE (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 45748 +SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b629ecfad317d468a981e23e0c9c6ca +SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392 SHA256 (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 8989734dc34c4cbd7841a98d96c4d9dbe3184be27f5b3a5d3a8e377d17a7f2f3 SIZE (ssgelm-cookiejarparser-v1.0.1_GH0.tar.gz) = 3237 -SHA256 (stretchr-testify-v1.5.1_GH0.tar.gz) = 6d65f92aeff186bb261dbdb885d9f3ba09db3d79eb5f212fcace1fd4a2858263 -SIZE (stretchr-testify-v1.5.1_GH0.tar.gz) = 78657 +SHA256 (stretchr-objx-v0.1.1_GH0.tar.gz) = 3bb0a581651f4c040435a70167ab60b723c5af04a5b0326af3c8b01ccc6fdcf0 +SIZE (stretchr-objx-v0.1.1_GH0.tar.gz) = 75768 +SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f +SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215 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-17bea8a2e504e3ef94101fe8c9356c7e406c988e_GL0.tar.gz) = 4b2d32f14f66ef2e71ab67b890bd9089aa3e6369ef9397dd1f04a7f194f0c497 -SIZE (gitlab-org-gitaly-17bea8a2e504e3ef94101fe8c9356c7e406c988e_GL0.tar.gz) = 3192541 -SHA256 (gitlab-org-gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b_GL0.tar.gz) = 1e12b1d55928131ac24d9eae147b98c871f9a9139da5dd8011ce27e42c3083a1 -SIZE (gitlab-org-gitlab-shell-1a2bfecd2f0ebb8e31f9833e0522c4643797041b_GL0.tar.gz) = 82494 -SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011 -SIZE (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 66930 +SHA256 (gitlab-org-gitaly-22221d4a96e129209eea3e876e50209a87dd40e7_GL0.tar.gz) = 1aa14ca789c677627e8a570aaf2c381036335810a17a04f7a45a80cf3c187373 +SIZE (gitlab-org-gitaly-22221d4a96e129209eea3e876e50209a87dd40e7_GL0.tar.gz) = 3218958 +SHA256 (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3 +SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583 +SHA256 (gitlab-org-labkit-40dcf811328cfe956de0d89ed9276a9d4f35eddd_GL0.tar.gz) = 21c2f89ff924a28f0783c69d33f0de2ef023e8d5271bbe8672354c4041381a3d +SIZE (gitlab-org-labkit-40dcf811328cfe956de0d89ed9276a9d4f35eddd_GL0.tar.gz) = 71311 Modified: head/devel/gitaly/files/patch-Makefile ============================================================================== --- head/devel/gitaly/files/patch-Makefile Sat Nov 28 14:58:16 2020 (r556495) +++ head/devel/gitaly/files/patch-Makefile Sat Nov 28 14:58:25 2020 (r556496) @@ -1,6 +1,6 @@ ---- Makefile.orig 2020-10-21 18:08:19 UTC +--- Makefile.orig 2020-11-20 11:52:08 UTC +++ Makefile -@@ -46,7 +46,7 @@ GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report +@@ -45,7 +45,7 @@ GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura # Build information @@ -9,7 +9,7 @@ GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) -@@ -157,7 +157,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} +@@ -156,7 +156,7 @@ all: INSTALL_DEST_DIR = ${SOURCE_DIR} all: install .PHONY: build @@ -18,7 +18,7 @@ go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands)) .PHONY: install -@@ -195,7 +195,7 @@ assemble-ruby: +@@ -194,7 +194,7 @@ assemble-ruby: .PHONY: binaries binaries: assemble ${Q}if [ ${ARCH} != 'x86_64' ]; then echo Incorrect architecture for build: ${ARCH}; exit 1; fi @@ -26,8 +26,8 @@ + ${Q}cd ${ASSEMBLY_ROOT} && sha256 bin/* | tee checksums.sha256.txt .PHONY: prepare-tests - prepare-tests: git ${GITLAB_SHELL_DIR}/config.yml ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle -@@ -354,8 +354,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a + prepare-tests: git ${TEST_REPO} ${TEST_REPO_GIT} ${SOURCE_DIR}/.ruby-bundle +@@ -349,8 +349,7 @@ 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 Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Sat Nov 28 14:58:16 2020 (r556495) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sat Nov 28 14:58:25 2020 (r556496) @@ -1,15 +1,14 @@ ---- ruby/Gemfile.orig 2020-10-21 18:08:19 UTC +--- ruby/Gemfile.orig 2020-11-20 11:52:08 UTC +++ ruby/Gemfile -@@ -3,7 +3,7 @@ source 'https://rubygems.org' - # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 - gem 'bundler', '>= 1.17.3' +@@ -1,6 +1,6 @@ + source 'https://rubygems.org' -gem 'rugged', '~> 0.28' +gem 'rugged', '~> 1.0' gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.3' -@@ -24,19 +24,3 @@ gem 'licensee', '~> 8.9.0' +@@ -21,13 +21,3 @@ gem 'licensee', '~> 8.9.0' gem 'google-protobuf', '~> 3.12' @@ -22,10 +21,4 @@ - gem 'pry', '~> 0.12.2', require: false - - gem 'grpc-tools', '= 1.30.2' -- -- # gitlab-shell spec gems -- gem 'listen', '~> 0.5.0' -- 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 Sat Nov 28 14:58:16 2020 (r556495) +++ head/devel/gitaly/pkg-plist Sat Nov 28 14:58:25 2020 (r556496) @@ -8,76 +8,6 @@ %%DATADIR%%/ruby/git-hooks/pre-receive %%DATADIR%%/ruby/git-hooks/reference-transaction %%DATADIR%%/ruby/git-hooks/update -%%DATADIR%%/ruby/gitlab-shell/.codeclimate.yml -%%DATADIR%%/ruby/gitlab-shell/.gitlab-ci.yml -%%DATADIR%%/ruby/gitlab-shell/CHANGELOG -%%DATADIR%%/ruby/gitlab-shell/CONTRIBUTING.md -%%DATADIR%%/ruby/gitlab-shell/LICENSE -%%DATADIR%%/ruby/gitlab-shell/README.md -%%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/lib/gitlab_access.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_access_status.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_config.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_custom_hook.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_init.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_logger.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_metrics.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_net/errors.rb -%%DATADIR%%/ruby/gitlab-shell/lib/gitlab_post_receive.rb -%%DATADIR%%/ruby/gitlab-shell/lib/hooks_utils.rb -%%DATADIR%%/ruby/gitlab-shell/lib/http_helper.rb -%%DATADIR%%/ruby/gitlab-shell/lib/httpunix.rb -%%DATADIR%%/ruby/gitlab-shell/lib/message.rb -%%DATADIR%%/ruby/gitlab-shell/lib/object_dirs_helper.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_access_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_config_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_custom_hook_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_logger_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_metrics_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_net_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/gitlab_post_receive_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/hooks_utils_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/httpunix_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/object_dirs_helper_spec.rb -%%DATADIR%%/ruby/gitlab-shell/spec/spec_helper.rb -%%DATADIR%%/ruby/gitlab-shell/spec/support/gitlab_shell_setup.rb -%%DATADIR%%/ruby/gitlab-shell/spec/support/gl_id_test_hook -%%DATADIR%%/ruby/gitlab-shell/spec/support/hook_fail -%%DATADIR%%/ruby/gitlab-shell/spec/support/hook_ok -%%DATADIR%%/ruby/gitlab-shell/spec/support/http_unix_server.rb -%%DATADIR%%/ruby/gitlab-shell/spec/support/vcr.rb -%%DATADIR%%/ruby/gitlab-shell/spec/support/webmock.rb -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-pull.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-html.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404-text-plain.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-404.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-html.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found-text-plain.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push-project-not-found.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/allowed-push.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/check-ok.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-pull-disabled.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/http-push-disabled.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive-not-found.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/post-receive.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive-not-found.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/pre-receive.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-disabled.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-html.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401-text-plain.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-401.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied-with-user.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-pull-project-denied.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-disabled.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-html.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401-text-plain.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied-401.yml -%%DATADIR%%/ruby/gitlab-shell/spec/vcr_cassettes/ssh-push-project-denied.yml %%DATADIR%%/ruby/lib/gitaly_server.rb %%DATADIR%%/ruby/lib/gitaly_server/blob_service.rb %%DATADIR%%/ruby/lib/gitaly_server/client.rb @@ -233,9 +163,6 @@ %%DATADIR%%/ruby/spec/support/sentry.rb %%DATADIR%%/ruby/spec/test_repo_helper.rb @(,,755) %%DATADIR%%/ruby/git-hooks/gitlab-shell-hook -@(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/post-receive -@(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/pre-receive -@(,,755) %%DATADIR%%/ruby/gitlab-shell/hooks/update @(,,555) %%DATADIR%%/bin/gitaly @(,,555) %%DATADIR%%/bin/gitaly-blackbox @(,,555) %%DATADIR%%/bin/gitaly-debug @@ -246,4 +173,3 @@ @(,,555) %%DATADIR%%/bin/gitaly-wrapper @(,,555) %%DATADIR%%/bin/praefect @sample %%DATADIR%%/config.toml.sample -@sample %%DATADIR%%/ruby/gitlab-shell/config.yml.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011281458.0ASEwPPS006369>