Date: Sat, 28 Mar 2020 09:01:29 +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: r529313 - in head/www/gitlab-workhorse: . files Message-ID: <202003280901.02S91TQ9051582@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sat Mar 28 09:01:29 2020 New Revision: 529313 URL: https://svnweb.freebsd.org/changeset/ports/529313 Log: Update to 8.25.1 which is required for gitlab-ce 12.9 upgrade. Deleted: head/www/gitlab-workhorse/files/patch-go.sum Modified: head/www/gitlab-workhorse/Makefile head/www/gitlab-workhorse/distinfo head/www/gitlab-workhorse/files/patch-go.mod Modified: head/www/gitlab-workhorse/Makefile ============================================================================== --- head/www/gitlab-workhorse/Makefile Sat Mar 28 09:00:51 2020 (r529312) +++ head/www/gitlab-workhorse/Makefile Sat Mar 28 09:01:29 2020 (r529313) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 8.21.1 +PORTVERSION= 8.25.1 PORTREVISION= 0 CATEGORIES= www @@ -21,35 +21,43 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-workhorse/tags -GL_COMMIT= ed1b6367d234d6be2e7d2be80e2b36f9814a2973 +GL_COMMIT= fbdf2b231e3db4f1fbbfd5c66d6a0024f7d435ca # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 52dd +# 60dd 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 \ FZambia:sentinel:v1.0.0:fzambia_sentinel/vendor/github.com/FZambia/sentinel \ beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \ + census-instrumentation:opencensus-go:v0.22.2:census_instrumentation_opencensus_go/vendor/go.opencensus.io \ certifi:gocertifi:ee1a9a0726d2:certifi_gocertifi/vendor/github.com/certifi/gocertifi \ client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \ 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 \ dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \ - dominikh:go-tools:v0.0.1-2019.2.2:dominikh_go_tools/vendor/honnef.co/go/tools \ + dominikh:go-tools:v0.0.1-2019.2.3:dominikh_go_tools/vendor/honnef.co/go/tools \ getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-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:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \ + golang:crypto:87dc89f01550:golang_crypto/vendor/golang.org/x/crypto \ golang:gddo:af0f2af80721:golang_gddo/vendor/github.com/golang/gddo \ - golang:lint:d0100b6bd8b3:golang_lint/vendor/golang.org/x/lint \ - golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \ + golang:groupcache:215e87163ea7:golang_groupcache/vendor/github.com/golang/groupcache \ + golang:lint:fdd1cda4f05f:golang_lint/vendor/golang.org/x/lint \ + 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:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ - golang:tools:6e04913cbbac:golang_tools/vendor/golang.org/x/tools \ + golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \ + golang:tools:43d50277825c:golang_tools/vendor/golang.org/x/tools \ gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \ - 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 \ + googleapis:gax-go:v2.0.5:googleapis_gax_go/vendor/github.com/googleapis/gax-go \ + 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 \ gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket \ 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 \ @@ -66,7 +74,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.2:prometheus_procfs/vendor/github.com/prometheus/procfs \ rafaeljusto:redigomock:257e089e14a1:rafaeljusto_redigomock/vendor/github.com/rafaeljusto/redigomock \ @@ -78,7 +86,7 @@ GH_TUPLE= \ uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib GL_TUPLE= gitlab-org:gitaly:acc6be5a2cba43e4a39d05a7c995062fb9279ee6:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \ - gitlab-org:labkit:3253d7975ca73714779c0a1fc95a27fb678071b6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit + gitlab-org:labkit:4f8041c014c2e9c6eed42674d76f5235afb5a36a:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit PLIST_FILES= bin/gitlab-workhorse \ bin/gitlab-zip-cat \ Modified: head/www/gitlab-workhorse/distinfo ============================================================================== --- head/www/gitlab-workhorse/distinfo Sat Mar 28 09:00:51 2020 (r529312) +++ head/www/gitlab-workhorse/distinfo Sat Mar 28 09:01:29 2020 (r529313) @@ -1,4 +1,4 @@ -TIMESTAMP = 1585254874 +TIMESTAMP = 1585262023 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 @@ -7,6 +7,8 @@ SHA256 (FZambia-sentinel-v1.0.0_GH0.tar.gz) = ae08e912 SIZE (FZambia-sentinel-v1.0.0_GH0.tar.gz) = 7919 SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866 +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 (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = b0b9ac422d6378c82be85f71f206757db24ecad314aca6155e9954363817fae1 SIZE (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = 143846 SHA256 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875 @@ -17,32 +19,46 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 SHA256 (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 197465ef53219f3aeb1a6940b70e16d288fe4e4108d4831b91ea101118440e63 SIZE (dgrijalva-jwt-go-v3.2.0_GH0.tar.gz) = 36960 -SHA256 (dominikh-go-tools-v0.0.1-2019.2.2_GH0.tar.gz) = 2e781527b7c5410e08738cb0f741b9179cd618e551f316652edaa99d1493a37c -SIZE (dominikh-go-tools-v0.0.1-2019.2.2_GH0.tar.gz) = 367495 +SHA256 (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 3b16c5bec68f71d13be0216b849ce910aa4a1844db6e08dafe90fb1a439974c7 +SIZE (dominikh-go-tools-v0.0.1-2019.2.3_GH0.tar.gz) = 367559 SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314 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-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316 +SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903 +SHA256 (golang-crypto-87dc89f01550_GH0.tar.gz) = d81e26d345c6cd9f132fd69547b14200603d6f3b50622ebceace32dfe456339b +SIZE (golang-crypto-87dc89f01550_GH0.tar.gz) = 1709204 SHA256 (golang-gddo-af0f2af80721_GH0.tar.gz) = a37eabe7bf2035e51718154b821f2aed6a384e4b7365e9a62463047e0872e24d SIZE (golang-gddo-af0f2af80721_GH0.tar.gz) = 2256821 -SHA256 (golang-lint-d0100b6bd8b3_GH0.tar.gz) = eb3e977d978529ddc4140e8bede5b741e8f4cd46f89735d17b213556e27d5e85 -SIZE (golang-lint-d0100b6bd8b3_GH0.tar.gz) = 32920 -SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4 -SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062 +SHA256 (golang-groupcache-215e87163ea7_GH0.tar.gz) = 500b097a42fb5c0cd516f1bb56e9c745ba6c1c910b4dc7296aea2b9120ee5e70 +SIZE (golang-groupcache-215e87163ea7_GH0.tar.gz) = 26040 +SHA256 (golang-lint-fdd1cda4f05f_GH0.tar.gz) = d02215cdf7a8c9e1874406b0414f3799e13e235ed4de142f837f68aa69d6fd55 +SIZE (golang-lint-fdd1cda4f05f_GH0.tar.gz) = 31573 +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-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146 -SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb -SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 -SHA256 (golang-tools-6e04913cbbac_GH0.tar.gz) = 76c1e182745c99749e4b6b46cf8486244ab2aa9be689f41d827d67a4221977c1 -SIZE (golang-tools-6e04913cbbac_GH0.tar.gz) = 2153108 +SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 +SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 +SHA256 (golang-tools-43d50277825c_GH0.tar.gz) = 6fba984657d1c9c077383dd72b06bae31be11845d899166c6e9352d254d48a53 +SIZE (golang-tools-43d50277825c_GH0.tar.gz) = 2332595 SHA256 (gomodule-redigo-v2.0.0_GH0.tar.gz) = b97a9b0298c371c80b4ba141cb683eaa003c8825a5b02526a03435f6e7568289 SIZE (gomodule-redigo-v2.0.0_GH0.tar.gz) = 42976 -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 (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 (gorilla-websocket-v1.4.0_GH0.tar.gz) = 2b5743c72bd0930c5a80e49c0138b5b7d27fa7c085efd0c86805cccfa7220c9d SIZE (gorilla-websocket-v1.4.0_GH0.tar.gz) = 50228 SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b @@ -75,8 +91,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.2_GH0.tar.gz) = ad1d1f1328a1c394b30225b939ed39482ba54de7be70d439c0555d68857457d5 @@ -95,9 +111,9 @@ 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-gitlab-workhorse-ed1b6367d234d6be2e7d2be80e2b36f9814a2973_GL0.tar.gz) = 24ad81c4e59f60b26ecb8f2ffec00dd075f9367198bd08bf019ada26f7522d2b -SIZE (gitlab-org-gitlab-workhorse-ed1b6367d234d6be2e7d2be80e2b36f9814a2973_GL0.tar.gz) = 207780 +SHA256 (gitlab-org-gitlab-workhorse-fbdf2b231e3db4f1fbbfd5c66d6a0024f7d435ca_GL0.tar.gz) = 3c1b3376cb7e124924ef756e38da47e09e3174f22708dd7aa1c70c5e0eff157e +SIZE (gitlab-org-gitlab-workhorse-fbdf2b231e3db4f1fbbfd5c66d6a0024f7d435ca_GL0.tar.gz) = 214885 SHA256 (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 40decb68620c061cadba556f836ef8efc953372b32903fd90825bb88fa79e943 SIZE (gitlab-org-gitaly-acc6be5a2cba43e4a39d05a7c995062fb9279ee6_GL0.tar.gz) = 2800331 -SHA256 (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = aa9fd1639498d41852acb1c894af5507009de15586a21413307a6832f68e6c3c -SIZE (gitlab-org-labkit-3253d7975ca73714779c0a1fc95a27fb678071b6_GL0.tar.gz) = 2660149 +SHA256 (gitlab-org-labkit-4f8041c014c2e9c6eed42674d76f5235afb5a36a_GL0.tar.gz) = 5be692b74fac460550a433ac34ac40213bbffd5ceac3a692cffd095fc033b90c +SIZE (gitlab-org-labkit-4f8041c014c2e9c6eed42674d76f5235afb5a36a_GL0.tar.gz) = 3619152 Modified: head/www/gitlab-workhorse/files/patch-go.mod ============================================================================== --- head/www/gitlab-workhorse/files/patch-go.mod Sat Mar 28 09:00:51 2020 (r529312) +++ head/www/gitlab-workhorse/files/patch-go.mod Sat Mar 28 09:01:29 2020 (r529313) @@ -1,10 +1,10 @@ ---- go.mod.orig 2020-02-06 20:48:09 UTC +--- go.mod.orig 2020-03-26 23:03:55 UTC +++ go.mod -@@ -25,6 +25,7 @@ require ( - gitlab.com/gitlab-org/labkit v0.0.0-20190902063225-3253d7975ca7 - golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 -+ golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect - golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac - google.golang.org/grpc v1.24.0 - honnef.co/go/tools v0.0.1-2019.2.2 +@@ -10,6 +10,7 @@ require ( + github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721 + github.com/golang/protobuf v1.3.2 + github.com/gomodule/redigo v2.0.0+incompatible ++ github.com/google/go-cmp v0.3.1 // indirect + github.com/gorilla/websocket v1.4.0 + github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003280901.02S91TQ9051582>