Index: head/www/gitlab-workhorse/Makefile =================================================================== --- head/www/gitlab-workhorse/Makefile (revision 513435) +++ head/www/gitlab-workhorse/Makefile (revision 513436) @@ -1,33 +1,94 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-workhorse -PORTVERSION= 8.8.1 +PORTVERSION= 8.10.0 CATEGORIES= www MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= git>=2.16.2:devel/git RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool -USES= gmake go:no_targets -USE_GITLAB= yes +USES= gmake go:modules,no_targets +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= febcb163140c1d54f153f868f7b811cbd174c952 -MAKE_JOBS_UNSAFE=yes +GL_COMMIT= 6ca9bc1ebc1541a3761429dc6d3b7f06ce190dd7 +# for go dependencies +USE_GITHUB= nodefault +# generated with gomod-deps below +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 \ + 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 \ + getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \ + golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \ + golang:gddo:af0f2af80721:golang_gddo/vendor/github.com/golang/gddo \ + golang:lint:06c8688daad7:golang_lint/vendor/golang.org/x/lint \ + golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \ + golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sys:953cdadca894: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 \ + gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \ + google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \ + 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 \ + grpc:grpc-go:v1.16.0:grpc_grpc_go/vendor/google.golang.org/grpc \ + jfbus:httprs:b0af8319bb15:jfbus_httprs/vendor/github.com/jfbus/httprs \ + jpillora:backoff:8eab2debe79d:jpillora_backoff/vendor/github.com/jpillora/backoff \ + konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ + lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ + matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \ + mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \ + opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ + 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: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.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 \ + sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \ + sirupsen:logrus:v1.3.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ + 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 + #::v0.0.1-2019.2.2:_/vendor/honnef.co/go/tools +GL_TUPLE= \ + gitlab-org:gitaly:a8e2980b1ffe1a728ab13032dc81f90f4b990a03:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \ + gitlab-org:labkit:905271af7abbfaa1d3549f46ac0394c50cef9b28:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit + + PLIST_FILES= bin/gitlab-workhorse \ bin/gitlab-zip-cat \ bin/gitlab-zip-metadata PLIST_DIRS= ${WWWDIR} + +# Build the go deps, use `pkg install modules2tuple` +gomod-deps: patch + (cd ${WRKSRC} && go mod vendor) + (cd ${WRKSRC} && modules2tuple vendor/modules.txt) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME} .include Index: head/www/gitlab-workhorse/distinfo =================================================================== --- head/www/gitlab-workhorse/distinfo (revision 513435) +++ head/www/gitlab-workhorse/distinfo (revision 513436) @@ -1,3 +1,99 @@ -TIMESTAMP = 1567414389 -SHA256 (gitlab-org-gitlab-workhorse-febcb163140c1d54f153f868f7b811cbd174c952_GL0.tar.gz) = c81d65488126f97479b03fef65e92d607310f661653afecd07acbee13820c469 -SIZE (gitlab-org-gitlab-workhorse-febcb163140c1d54f153f868f7b811cbd174c952_GL0.tar.gz) = 2955428 +TIMESTAMP = 1569751062 +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 (FZambia-sentinel-v1.0.0_GH0.tar.gz) = ae08e912e4fd69a0c5d11f832a484f13695ce20e8d32878eba23bc89d9d79e5e +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 (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 +SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283 +SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0 +SIZE (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 7738 +SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e +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 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5 +SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314 +SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f +SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016 +SHA256 (golang-gddo-af0f2af80721_GH0.tar.gz) = a37eabe7bf2035e51718154b821f2aed6a384e4b7365e9a62463047e0872e24d +SIZE (golang-gddo-af0f2af80721_GH0.tar.gz) = 2256821 +SHA256 (golang-lint-06c8688daad7_GH0.tar.gz) = 8f3a13b90cd1425d890288d2ac81a4c24278b7cb85f2e7adf96ee7d918bb4648 +SIZE (golang-lint-06c8688daad7_GH0.tar.gz) = 31924 +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-sys-953cdadca894_GH0.tar.gz) = fb56f244784dac7e7f66fc0ff9f5ff6adbd49ccb8f3625285e6e39254b64c12f +SIZE (golang-sys-953cdadca894_GH0.tar.gz) = 1353286 +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 (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 (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 +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 +SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 +SHA256 (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a +SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087 +SHA256 (jfbus-httprs-b0af8319bb15_GH0.tar.gz) = c186a0bc869db44948da673132f29d9147d54a2b55a65ca16ce2c9cd616e3639 +SIZE (jfbus-httprs-b0af8319bb15_GH0.tar.gz) = 5926 +SHA256 (jpillora-backoff-8eab2debe79d_GH0.tar.gz) = 53b3dcecf460fa4a1f21e90b486397056e661a72da15347eaa49618a0559b3f0 +SIZE (jpillora-backoff-8eab2debe79d_GH0.tar.gz) = 3262 +SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe +SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987 +SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14 +SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986 +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 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8 +SIZE (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903 +SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3 +SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143 +SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df +SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 +SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff +SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221 +SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5 +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-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.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 (rafaeljusto-redigomock-257e089e14a1_GH0.tar.gz) = 4675249a5ae415d8ac222ac160a2d35b00fd708a9953dc2eebade5386613aea9 +SIZE (rafaeljusto-redigomock-257e089e14a1_GH0.tar.gz) = 20596 +SHA256 (sebest-xff-6c115e0ffa35_GH0.tar.gz) = e39b98f5b0622d8d6599ca14011b4e148324eff67b69524b0ef766d64050d9e3 +SIZE (sebest-xff-6c115e0ffa35_GH0.tar.gz) = 4000 +SHA256 (sirupsen-logrus-v1.3.0_GH0.tar.gz) = f80cfa34148c4e25c4d3030edb1fd9878d666eca7e900f1aaf0d87c67ecabe51 +SIZE (sirupsen-logrus-v1.3.0_GH0.tar.gz) = 38452 +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-gitlab-workhorse-6ca9bc1ebc1541a3761429dc6d3b7f06ce190dd7_GL0.tar.gz) = 1bacdb0a0f3df89cb20d57a2a7d87f6fac9f75d01ca3829ea3e57a97f264b6e6 +SIZE (gitlab-org-gitlab-workhorse-6ca9bc1ebc1541a3761429dc6d3b7f06ce190dd7_GL0.tar.gz) = 200538 +SHA256 (gitlab-org-gitaly-a8e2980b1ffe1a728ab13032dc81f90f4b990a03_GL0.tar.gz) = 230b9d7f8df10fa6c32c8143d04e8822d2d1a3dd1ca2f0942d3a66f674964a37 +SIZE (gitlab-org-gitaly-a8e2980b1ffe1a728ab13032dc81f90f4b990a03_GL0.tar.gz) = 2262713 +SHA256 (gitlab-org-labkit-905271af7abbfaa1d3549f46ac0394c50cef9b28_GL0.tar.gz) = c3830ed2d37c1e5025ec0af68a0768c046c1813f8ac7ec6fc6edb7d589d451b7 +SIZE (gitlab-org-labkit-905271af7abbfaa1d3549f46ac0394c50cef9b28_GL0.tar.gz) = 2504238