From nobody Wed Oct 27 06:21:05 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8BC6B182FE1B; Wed, 27 Oct 2021 06:21:09 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HfJVC52lCz4Tng; Wed, 27 Oct 2021 06:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E62B52FB3; Wed, 27 Oct 2021 06:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19R6L5fG060777; Wed, 27 Oct 2021 06:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19R6L53b060776; Wed, 27 Oct 2021 06:21:05 GMT (envelope-from git) Date: Wed, 27 Oct 2021 06:21:05 GMT Message-Id: <202110270621.19R6L53b060776@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: e492c6fd35a3 - main - www/gitlab-workhorse: Update to 14.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e492c6fd35a3cacf44267efc13b73ef83eb7706a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e492c6fd35a3cacf44267efc13b73ef83eb7706a commit e492c6fd35a3cacf44267efc13b73ef83eb7706a Author: Matthias Fechner AuthorDate: 2021-10-26 19:23:22 +0000 Commit: Matthias Fechner CommitDate: 2021-10-27 06:20:36 +0000 www/gitlab-workhorse: Update to 14.4.0 Required for gitlab-ce 14.4.0. --- www/gitlab-workhorse/Makefile | 55 ++++++++++---------- www/gitlab-workhorse/distinfo | 90 ++++++++++++++++----------------- www/gitlab-workhorse/files/patch-go.mod | 8 +-- www/gitlab-workhorse/files/patch-go.sum | 11 ++-- 4 files changed, 79 insertions(+), 85 deletions(-) diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index d461af62bd86..ec1c1696f3c1 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-workhorse -PORTVERSION= 14.3.2 +PORTVERSION= 14.4.0 PORTREVISION= 0 CATEGORIES= www @@ -23,30 +23,29 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 92acfb1b8a9019b3fa3c817d251b2624d55da26d +GL_COMMIT= 51b27ab58055b65e14e68b19604e4823389adb73 # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 106dd +# 103dd GH_TUPLE= \ Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \ - Azure:azure-storage-blob-go:6df5d9af221d:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ - Azure:go-autorest:autorest/v0.11.12:azure_go_autorest_autorest \ + Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ + Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \ + Azure:go-autorest:autorest/v0.11.18:azure_go_autorest_autorest \ Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \ - Azure:go-autorest:b8bf08c40b80:azure_go_autorest_adal \ - Azure:go-autorest:logger/v0.2.0:azure_go_autorest_logger \ + Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \ Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \ Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \ BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ DataDog:datadog-go:v4.4.0:datadog_datadog_go/vendor/github.com/DataDog/datadog-go \ DataDog:dd-trace-go:v1.31.1:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ - DataDog:sketches-go:v1.0.0:datadog_sketches_go/vendor/github.com/DataDog/sketches-go \ FZambia:sentinel:v1.0.0:fzambia_sentinel/vendor/github.com/FZambia/sentinel \ Microsoft:go-winio:v0.4.19:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \ StackExchange:wmi:cbe66965904d:stackexchange_wmi/vendor/github.com/StackExchange/wmi \ alecthomas:chroma:v0.7.3:alecthomas_chroma/vendor/github.com/alecthomas/chroma \ - aws:aws-sdk-go:v1.37.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ + aws:aws-sdk-go:v1.38.35:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \ beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ census-ecosystem:opencensus-go-exporter-stackdriver:v0.13.8:census_ecosystem_opencensus_go_exporter_stackdriver/vendor/contrib.go.opencensus.io/exporter/stackdriver \ census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ @@ -66,37 +65,36 @@ GH_TUPLE= \ gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \ golang-jwt:jwt:v4.0.0:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \ golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \ - golang:crypto:be400aefbc4c:golang_crypto/vendor/golang.org/x/crypto \ + golang:crypto:38f3c27a63bf:golang_crypto/vendor/golang.org/x/crypto \ golang:gddo:af0f2af80721:golang_gddo/vendor/github.com/golang/gddo \ golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ golang:image:e7c1f5e7dbb8:golang_image/vendor/golang.org/x/image \ golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \ - golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \ - golang:net:d523dce5a7f4:golang_net/vendor/golang.org/x/net \ - golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \ + golang:mod:v0.4.2:golang_mod/vendor/golang.org/x/mod \ + golang:net:0714010a04ed:golang_net/vendor/golang.org/x/net \ + golang:oauth2:81ed05c6b58c:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \ - golang:sys:f1c623a9e750:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \ - golang:time:3af7569d3a1e:golang_time/vendor/golang.org/x/time \ + golang:sys:0981d6026fa6:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \ + golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \ golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \ - google:go-cloud:5094f54ed8bb:google_go_cloud/vendor/gocloud.dev \ + google:go-cloud:v0.23.0:google_go_cloud/vendor/gocloud.dev \ google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \ - google:go-genproto:c14fb6ef47c3:google_go_genproto/vendor/google.golang.org/genproto \ + google:go-genproto:4a47615972c2:google_go_genproto/vendor/google.golang.org/genproto \ google:pprof:cbba55b83ad5:google_pprof/vendor/github.com/google/pprof \ - google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \ - google:wire:v0.4.0:google_wire/vendor/github.com/google/wire \ - googleapis:gax-go:v2.0.2:googleapis_gax_go/vendor/github.com/googleapis/gax-go \ - googleapis:gax-go:v2.0.5:googleapis_gax_go_v2 \ - googleapis:google-api-go-client:v0.45.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ + google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \ + google:wire:v0.5.0:google_wire/vendor/github.com/google/wire \ + googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \ + googleapis:google-api-go-client:v0.46.0:googleapis_google_api_go_client/vendor/google.golang.org/api \ googleapis:google-cloud-go:v0.81.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \ gopherjs:gopherjs:0766667cb4d1:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \ gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \ grpc-ecosystem:go-grpc-middleware:v1.3.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.37.0:grpc_grpc_go/vendor/google.golang.org/grpc \ + grpc:grpc-go:v1.38.0:grpc_grpc_go/vendor/google.golang.org/grpc \ hashicorp:yamux:a95892c5f864:hashicorp_yamux/vendor/github.com/hashicorp/yamux \ jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ johannesboyne:gofakes3:02d71f533bec:johannesboyne_gofakes3/vendor/github.com/johannesboyne/gofakes3 \ @@ -128,11 +126,11 @@ GH_TUPLE= \ smartystreets:goconvey:v1.6.4:smartystreets_goconvey/vendor/github.com/smartystreets/goconvey \ stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \ tinylib:msgp:v1.1.2:tinylib_msgp/vendor/github.com/tinylib/msgp \ - uber-go:atomic:v1.5.0:uber_go_atomic/vendor/go.uber.org/atomic \ + uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \ uber:jaeger-client-go:v2.27.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ uber:jaeger-lib:v2.4.1:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib -GL_TUPLE= gitlab-org:gitaly:e078d5bd7c5eb37caa222faa15010ce6decc6aa6:gitlab_org_gitaly_v14/vendor/gitlab.com/gitlab-org/gitaly/v14 \ +GL_TUPLE= gitlab-org:gitaly:df7dadcc3f74276a7176234d4b1475299f46c05c:gitlab_org_gitaly_v14/vendor/gitlab.com/gitlab-org/gitaly/v14 \ gitlab-org:labkit:9205b46eea68f47a36cefa783a306476f0b2dbfd:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit PLIST_FILES= bin/gitlab-resize-image \ @@ -141,7 +139,7 @@ PLIST_FILES= bin/gitlab-resize-image \ bin/gitlab-zip-metadata PLIST_DIRS= ${WWWDIR} -# 13dd +# 11dd post-extract: @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest @${RLN} ${WRKSRC_azure_go_autorest_autorest}/autorest ${WRKSRC}/vendor/github.com/Azure/go-autorest/autorest @@ -153,11 +151,10 @@ post-extract: @${RLN} ${WRKSRC_azure_go_autorest_logger}/logger ${WRKSRC}/vendor/github.com/Azure/go-autorest/logger @${RM} -r ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing @${RLN} ${WRKSRC_azure_go_autorest_tracing}/tracing ${WRKSRC}/vendor/github.com/Azure/go-autorest/tracing - @${RM} -r ${WRKSRC}/vendor/github.com/googleapis/gax-go/v2 - @${RLN} ${WRKSRC_googleapis_gax_go_v2}/v2 ${WRKSRC}/vendor/github.com/googleapis/gax-go/v2 post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME} .include + diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 59808c3d77f6..073562693179 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,16 +1,16 @@ -TIMESTAMP = 1633159257 +TIMESTAMP = 1634883120 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 -SHA256 (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7 -SIZE (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 240532 -SHA256 (Azure-go-autorest-autorest-v0.11.12_GH0.tar.gz) = 79b749fc9e13670756e6a83bc966c04232990aa6fa26a7e0c0910aab3924f591 -SIZE (Azure-go-autorest-autorest-v0.11.12_GH0.tar.gz) = 169481 +SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443 +SIZE (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 242403 +SHA256 (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = d7156c20c47fcd04edae683e718a1e72dcb9178a3b07e6c18615cee5b1dd67d6 +SIZE (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = 175215 +SHA256 (Azure-go-autorest-autorest-v0.11.18_GH0.tar.gz) = c6fc9480fbdc441b40e45ca97244ea3bdd82efe245a52fdd7cb2faa58b4d55b2 +SIZE (Azure-go-autorest-autorest-v0.11.18_GH0.tar.gz) = 175246 SHA256 (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 51b31571a26a5287eb67251aa69407bb6145f58253bdbb2e610b7eab7b0d762f SIZE (Azure-go-autorest-b3a0b30a7423_GH0.tar.gz) = 167123 -SHA256 (Azure-go-autorest-b8bf08c40b80_GH0.tar.gz) = dfdc6112ced1c0886d6a2b8053f6cad514c675cad1123894abb3e4ee414bfd88 -SIZE (Azure-go-autorest-b8bf08c40b80_GH0.tar.gz) = 170523 -SHA256 (Azure-go-autorest-logger-v0.2.0_GH0.tar.gz) = 5d38b489d18d837ffeafbc354dbffde3bea71014318d465a7c2f4690e5bc4372 -SIZE (Azure-go-autorest-logger-v0.2.0_GH0.tar.gz) = 167096 +SHA256 (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = fac35805dc320638a322b407c0cd0c471932a4855e9ef0485c85e533af8146dc +SIZE (Azure-go-autorest-logger-v0.2.1_GH0.tar.gz) = 175062 SHA256 (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = b43cd0127dd6e91debe1eb98873e219817b71c10988d0a6c550e4ad19a29a8ea SIZE (Azure-go-autorest-tracing-v0.6.0_GH0.tar.gz) = 167113 SHA256 (Azure-go-autorest-v14.2.0_GH0.tar.gz) = d0db0e47112570e3f2bd2e38ae56338f1e74625dd4cb553007082fdad5fd844d @@ -21,8 +21,6 @@ SHA256 (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = ca4e63041f5e0a176f0affd7a5997925 SIZE (DataDog-datadog-go-v4.4.0_GH0.tar.gz) = 43175 SHA256 (DataDog-dd-trace-go-v1.31.1_GH0.tar.gz) = 9e16bb928d2445fd3430b25b0acbb562077a4c93ad737eeed67bcb38eac8c9ab SIZE (DataDog-dd-trace-go-v1.31.1_GH0.tar.gz) = 601733 -SHA256 (DataDog-sketches-go-v1.0.0_GH0.tar.gz) = 882d27e9f2b65f8b1de6f0f53fe141044df31ccc02abb6ca12d7a74ebd8b7b7b -SIZE (DataDog-sketches-go-v1.0.0_GH0.tar.gz) = 22089 SHA256 (FZambia-sentinel-v1.0.0_GH0.tar.gz) = ae08e912e4fd69a0c5d11f832a484f13695ce20e8d32878eba23bc89d9d79e5e SIZE (FZambia-sentinel-v1.0.0_GH0.tar.gz) = 7919 SHA256 (Microsoft-go-winio-v0.4.19_GH0.tar.gz) = aa80cb2aa45ffd97808c2365c554f839757408f822a0774a356b7b918360fc20 @@ -31,8 +29,8 @@ SHA256 (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 14dbc4af6952acdb1b941d002cd SIZE (StackExchange-wmi-cbe66965904d_GH0.tar.gz) = 11279 SHA256 (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 1007e82cc44cea04542c282b19bab25a59cb1e53149aaa7f0e2d9ce72ba80114 SIZE (alecthomas-chroma-v0.7.3_GH0.tar.gz) = 615181 -SHA256 (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = d0bc2f98fe8ead35497d267ee9dc534ab26a5417bb5ca61ce63ca75e9a801b1d -SIZE (aws-aws-sdk-go-v1.37.0_GH0.tar.gz) = 18127514 +SHA256 (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 1c1cd41669e75f4225b8fda42f7500f21408d0a8575ad3665542338ba267242b +SIZE (aws-aws-sdk-go-v1.38.35_GH0.tar.gz) = 18967606 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 SHA256 (census-ecosystem-opencensus-go-exporter-stackdriver-v0.13.8_GH0.tar.gz) = 759ac647e059e4fddf4857bcac7b5a82a4a5c389a15dd67b74f647bb8dcf127e @@ -71,8 +69,8 @@ SHA256 (golang-jwt-jwt-v4.0.0_GH0.tar.gz) = 5d305c23625c50ed87968122a7fe17d76066 SIZE (golang-jwt-jwt-v4.0.0_GH0.tar.gz) = 40180 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007 -SHA256 (golang-crypto-be400aefbc4c_GH0.tar.gz) = 52f3f5dc88c5ab7428a9bed403127266d1b5fc90af6a4f6685f98259bb7b7452 -SIZE (golang-crypto-be400aefbc4c_GH0.tar.gz) = 1722808 +SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31 +SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839 SHA256 (golang-gddo-af0f2af80721_GH0.tar.gz) = a37eabe7bf2035e51718154b821f2aed6a384e4b7365e9a62463047e0872e24d SIZE (golang-gddo-af0f2af80721_GH0.tar.gz) = 2256821 SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394 @@ -81,46 +79,44 @@ SHA256 (golang-image-e7c1f5e7dbb8_GH0.tar.gz) = 424ce3674771f00cc1112826e745efb1 SIZE (golang-image-e7c1f5e7dbb8_GH0.tar.gz) = 4895813 SHA256 (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 5014077abbc075c3b4b459f7ad98cc1c28f2ae6bde906a9d8ed19d8c8b97987a SIZE (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 31889 -SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59 -SIZE (golang-mod-v0.4.1_GH0.tar.gz) = 102751 -SHA256 (golang-net-d523dce5a7f4_GH0.tar.gz) = 2845c6b37390b25a88a8a71e211e1ed9da8a1f6363baa275d6d30e8dd0d00a21 -SIZE (golang-net-d523dce5a7f4_GH0.tar.gz) = 1252646 -SHA256 (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 01ea885d501ffceaecaef9a91a433c3391583f4ee6cae16115ebb2ccafcc90c9 -SIZE (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 78982 +SHA256 (golang-mod-v0.4.2_GH0.tar.gz) = ce4131eb443ac67ededb139a43bae4fbb2c4b84843936495c6a6de92b8033917 +SIZE (golang-mod-v0.4.2_GH0.tar.gz) = 104584 +SHA256 (golang-net-0714010a04ed_GH0.tar.gz) = 62ba863366262fbbc211a65b1301f7fcf75f5f710fd979c27607af49ea51ba21 +SIZE (golang-net-0714010a04ed_GH0.tar.gz) = 1250017 +SHA256 (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 84828c3d8d1e1b5fdec9fef502f37308de4244571316063f72beb0bb20f07fe0 +SIZE (golang-oauth2-81ed05c6b58c_GH0.tar.gz) = 79557 SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3 SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702 SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752 -SHA256 (golang-sys-f1c623a9e750_GH0.tar.gz) = 15a6f78a91827579b9e204b14e4efa338840b5cd797d03400cea62a0b9d8bed5 -SIZE (golang-sys-f1c623a9e750_GH0.tar.gz) = 1219335 -SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27 -SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127 -SHA256 (golang-time-3af7569d3a1e_GH0.tar.gz) = 93c79ee7ad72641dc5ebd47e6ecffa66e878e367ddbbef48208ff82a0b6fc7e0 -SIZE (golang-time-3af7569d3a1e_GH0.tar.gz) = 9619 +SHA256 (golang-sys-0981d6026fa6_GH0.tar.gz) = 1027a8cd31706610f83425e844a1ea03309526ed499d5cab13ecf9f53d923eca +SIZE (golang-sys-0981d6026fa6_GH0.tar.gz) = 1235549 +SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760 +SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095 +SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb +SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656 SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2 SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664 SHA256 (gomodule-redigo-v2.0.0_GH0.tar.gz) = b97a9b0298c371c80b4ba141cb683eaa003c8825a5b02526a03435f6e7568289 SIZE (gomodule-redigo-v2.0.0_GH0.tar.gz) = 42976 -SHA256 (google-go-cloud-5094f54ed8bb_GH0.tar.gz) = 07575ad4f9bee02ae440190e188c43325c5b24733546eb7c565a7deca260b62a -SIZE (google-go-cloud-5094f54ed8bb_GH0.tar.gz) = 2594866 +SHA256 (google-go-cloud-v0.23.0_GH0.tar.gz) = 7d5688a41b79443f775c5db9118e27f3d37a6b9f9e0064635eb800fa25244ae5 +SIZE (google-go-cloud-v0.23.0_GH0.tar.gz) = 2619492 SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358 -SHA256 (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 26b5114e119b8945b16a7205d55e1dbd3c006940ac4568d670081690ef7210a8 -SIZE (google-go-genproto-c14fb6ef47c3_GH0.tar.gz) = 8642924 +SHA256 (google-go-genproto-4a47615972c2_GH0.tar.gz) = b24811e4ac7d0d46c4778cb87a4afd77f99eaf152fd43609fcb004ed1f4b98df +SIZE (google-go-genproto-4a47615972c2_GH0.tar.gz) = 8968771 SHA256 (google-pprof-cbba55b83ad5_GH0.tar.gz) = 637bcea06f4a595d126e02e94075c625bc283ac9056904e68bb57fb2b125e47f SIZE (google-pprof-cbba55b83ad5_GH0.tar.gz) = 1717915 -SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0 -SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871 -SHA256 (google-wire-v0.4.0_GH0.tar.gz) = dacea2edfd662d5206269bf7c99f9c3a1b0ab9f74d01255ea22faf68ad9c16c1 -SIZE (google-wire-v0.4.0_GH0.tar.gz) = 87136 -SHA256 (googleapis-gax-go-v2.0.2_GH0.tar.gz) = 624786968d59eb032cfe049f139ddc14be1be5d508c34ebf520edc3946bae2ac -SIZE (googleapis-gax-go-v2.0.2_GH0.tar.gz) = 8942 +SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380 +SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158 +SHA256 (google-wire-v0.5.0_GH0.tar.gz) = 97f21d31d8a2b3b04feeee1467697c863919b62882ab2ec450ee282dab076812 +SIZE (google-wire-v0.5.0_GH0.tar.gz) = 88112 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.45.0_GH0.tar.gz) = 628120c26b3db51e218d50b3555eb552a12993e5c1096b4ed8ad200bae925985 -SIZE (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 20020236 +SHA256 (googleapis-google-api-go-client-v0.46.0_GH0.tar.gz) = 33cd2b3a446679cc8dbbbcc64aaf730241ee3400ac0c89021922683b12355e3d +SIZE (googleapis-google-api-go-client-v0.46.0_GH0.tar.gz) = 20181199 SHA256 (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 307f191f0ebcd71b96ec66554670eb3cf0398c64a427e43651472b5d9616f1ae SIZE (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 3510192 SHA256 (gopherjs-gopherjs-0766667cb4d1_GH0.tar.gz) = bc4d58aabc0e9958a9b8f9ebd835f1deabe5061750d070fc1e2e41fe6e6d643a @@ -131,8 +127,8 @@ SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f82 SIZE (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = 103780 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 -SHA256 (grpc-grpc-go-v1.37.0_GH0.tar.gz) = ab96e0de7416d1d26ea5c98417d21cd72b2c66094b80ba3ab1d03f4a5aa728ca -SIZE (grpc-grpc-go-v1.37.0_GH0.tar.gz) = 1236791 +SHA256 (grpc-grpc-go-v1.38.0_GH0.tar.gz) = fd6a2e2ae9e810670fdb63d196275ddb171e7f99f3bb801a02dde973de2f557b +SIZE (grpc-grpc-go-v1.38.0_GH0.tar.gz) = 1253222 SHA256 (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 9468ab6cee06cee3e1883a99f5d763bd8d9111e13ce499c5f5f5a705a9979789 SIZE (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 24397 SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d @@ -195,15 +191,15 @@ SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5a SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073 SHA256 (tinylib-msgp-v1.1.2_GH0.tar.gz) = 9759dc9f45160ff1161d670d019f509d55e12b22dfc8a8e1ed71f4c358ee1a01 SIZE (tinylib-msgp-v1.1.2_GH0.tar.gz) = 83078 -SHA256 (uber-go-atomic-v1.5.0_GH0.tar.gz) = 3b003515efb86c67aced0ce9e954cca50964ee0afe83e5a63dfe43aa58347290 -SIZE (uber-go-atomic-v1.5.0_GH0.tar.gz) = 9365 +SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1 +SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566 SHA256 (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 7590acdefcbbf9553bd3415bc7e5ec977731646363c5350d56faba31a097d996 SIZE (uber-jaeger-client-go-v2.27.0_GH0.tar.gz) = 210139 SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701adf6e3a9e01e1ca3e5edfc3c6de8bc SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010 -SHA256 (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = d618d90f40dd63d5b85d8540ee0d31578cf4a317f5ea3b5432c53b0187a0da5b -SIZE (gitlab-org-gitlab-foss-92acfb1b8a9019b3fa3c817d251b2624d55da26d_GL0.tar.gz) = 94745309 -SHA256 (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 31a6c86d809082126e11e98e050749932861297a3d21c8e4756b5618e06ac9fd -SIZE (gitlab-org-gitaly-e078d5bd7c5eb37caa222faa15010ce6decc6aa6_GL0.tar.gz) = 3465551 +SHA256 (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 6092274b8b3292f0c1956ee31591ece91c47ebf2c213ab793ea6fa4b5b7e35f7 +SIZE (gitlab-org-gitlab-foss-51b27ab58055b65e14e68b19604e4823389adb73_GL0.tar.gz) = 94863812 +SHA256 (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 4c403ee52c1d42d54e9acd14026796782e8272e74c8eb7c3cedf9c924697647e +SIZE (gitlab-org-gitaly-df7dadcc3f74276a7176234d4b1475299f46c05c_GL0.tar.gz) = 3703056 SHA256 (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd_GL0.tar.gz) = c957c444298dd0f9ade07cb643d03e455dcc28d24bd203ead8d241bf50c6df57 SIZE (gitlab-org-labkit-9205b46eea68f47a36cefa783a306476f0b2dbfd_GL0.tar.gz) = 146429 diff --git a/www/gitlab-workhorse/files/patch-go.mod b/www/gitlab-workhorse/files/patch-go.mod index f62248c3d236..507f4c7b4584 100644 --- a/www/gitlab-workhorse/files/patch-go.mod +++ b/www/gitlab-workhorse/files/patch-go.mod @@ -1,9 +1,9 @@ ---- go.mod.orig 2021-08-31 07:42:01 UTC +--- go.mod.orig 2021-10-22 06:09:00 UTC +++ go.mod -@@ -37,6 +37,6 @@ require ( - golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 +@@ -36,6 +36,6 @@ require ( + golang.org/x/net v0.0.0-20210505214959-0714010a04ed golang.org/x/tools v0.1.0 - google.golang.org/grpc v1.37.0 + google.golang.org/grpc v1.38.0 - gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 // indirect + gopkg.in/DataDog/dd-trace-go.v1 v1.31.1 // indirect honnef.co/go/tools v0.1.3 diff --git a/www/gitlab-workhorse/files/patch-go.sum b/www/gitlab-workhorse/files/patch-go.sum index a32f06ef4f6c..115eefd1eb72 100644 --- a/www/gitlab-workhorse/files/patch-go.sum +++ b/www/gitlab-workhorse/files/patch-go.sum @@ -1,14 +1,15 @@ ---- go.sum.orig 2021-08-31 07:42:22 UTC +--- go.sum.orig 2021-10-22 06:12:32 UTC +++ go.sum -@@ -101,6 +101,7 @@ github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmd +@@ -100,6 +100,8 @@ github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmd github.com/DataDog/datadog-go v4.4.0+incompatible h1:R7WqXWP4fIOAqWJtUKmSfuc7eDsBT58k9AY5WSHVosk= github.com/DataDog/datadog-go v4.4.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/gostackparse v0.5.0/go.mod h1:lTfqcJKqS9KnXQGnyQMCugq3u1FP6UZMfWR0aitKFMM= ++github.com/DataDog/sketches-go v1.0.0 h1:chm5KSXO7kO+ywGWJ0Zs6tdmWU8PBXSbywFVciL6BG4= +github.com/DataDog/sketches-go v1.0.0/go.mod h1:O+XkJHWk9w4hDwY2ZUDU31ZC9sNYlYo8DiFsxjYeo1k= github.com/FZambia/sentinel v1.0.0 h1:KJ0ryjKTZk5WMp0dXvSdNqp3lFaW1fNFuEYfrkLOYIc= github.com/FZambia/sentinel v1.0.0/go.mod h1:ytL1Am/RLlAoAXG6Kj5LNuw/TRRQrv2rt2FT26vP5gI= - github.com/GoogleCloudPlatform/cloudsql-proxy v1.19.1/go.mod h1:+yYmuKqcBVkgRePGpUhTA9OEg0XsnFE96eZ6nJ2yCQM= -@@ -369,6 +370,7 @@ github.com/google/go-replayers/grpcreplay v1.0.0/go.mo + github.com/GoogleCloudPlatform/cloudsql-proxy v1.22.0/go.mod h1:mAm5O/zik2RFmcpigNjg6nMotDL8ZXJaxKzgGVcSMFA= +@@ -390,6 +392,7 @@ github.com/google/go-replayers/grpcreplay v1.0.0/go.mo github.com/google/go-replayers/httpreplay v0.1.2 h1:HCfx+dQzwN9XbGTHF8qJ+67WN8glL9FTWV5rraCJ/jU= github.com/google/go-replayers/httpreplay v0.1.2/go.mod h1:YKZViNhiGgqdBlUbI2MwGpq4pXxNmhJLPHQ7cv2b5no= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -16,7 +17,7 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:xmapqc1AyLoB+ddYT6r04bD9lIjlOqGaREovi0SzFaE= github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -@@ -1263,6 +1265,8 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8H +@@ -1327,6 +1330,8 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.7.0/go.mod h1:DVp8H gopkg.in/DataDog/dd-trace-go.v1 v1.30.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8= gopkg.in/DataDog/dd-trace-go.v1 v1.31.0 h1:ouY+DNlRTckk63TNh468tPWBC21qBZPniVQXQs0iq10= gopkg.in/DataDog/dd-trace-go.v1 v1.31.0/go.mod h1:SnKViq44dv/0gjl9RpkP0Y2G3BJSRkp6eYdCSu39iI8=