Index: head/devel/gitlab-shell/Makefile =================================================================== --- head/devel/gitlab-shell/Makefile (revision 558916) +++ head/devel/gitlab-shell/Makefile (revision 558917) @@ -1,104 +1,104 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME?= gitlab-shell -PORTVERSION?= 13.13.0 +PORTVERSION?= 13.14.0 PORTREVISION?= 0 CATEGORIES= devel MAINTAINER?= mfechner@FreeBSD.org COMMENT?= GitLab Shell handles git commands for GitLab LICENSE= MIT BUILD_DEPENDS= rubygem-bundler>=2.1.4<2.1.5,1:sysutils/rubygem-bundler USES= gmake go:modules,no_targets MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" ALL_TARGET= build USE_GITLAB= yes GL_ACCOUNT?= gitlab-org # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-shell/tags -GL_COMMIT?= 3f9890ef73dced430d86801a1efc0e93ec50890e +GL_COMMIT?= 921712c8522d074afc8ba52d247f5165b5c26ec9 USERS= git GROUPS= git INSTALL_TARGET= install-strip # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-deps # 36dd # Make sure you have here the path .../go/vendor/... and not .../vendor/... GH_TUPLE= \ 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 \ client9:reopen:v1.0.0:client9_reopen/vendor/github.com/client9/reopen \ 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 \ go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ golang:net:6afb5195e5aa:golang_net/vendor/golang.org/x/net \ golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \ golang:sys:86b910548bc1: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 \ grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc:grpc-go:v1.24.0:grpc_grpc_go/vendor/google.golang.org/grpc \ konsorten:go-windows-terminal-sequences:v1.0.3: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 \ mattn:go-shellwords:2444a32a19f4:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \ matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ otiai10:copy:v1.0.1:otiai10_copy/vendor/github.com/otiai10/copy \ philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ 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: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 \ sebest:xff:6c115e0ffa35:sebest_xff/vendor/github.com/sebest/xff \ sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ stretchr:testify:v1.4.0:stretchr_testify/vendor/github.com/stretchr/testify \ tinylib:msgp:v1.0.2: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:gitaly:3f5e218def93024f3aafe590c22cd1b29f744105:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \ gitlab-org:labkit:45895e1290291a2519678a847a24edb22880b9e6:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit VARLOGDIR?= /var/log/gitlab-shell PLIST_FILES+= "@dir(git,,755) ${VARLOGDIR}" post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml # Build the go deps, use `pkg install modules2tuple` gomod-deps: patch (cd ${WRKSRC} && go mod vendor) (cd ${WRKSRC} && modules2tuple vendor/modules.txt) pre-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build) pre-install: ${RM} -rf ${WRKSRC}/config.yml #${RM} -rf ${WRKSRC}/go_build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} .for x in .codeclimate.yml .gitignore .gitlab-ci.yml .ruby-version CHANGELOG CONTRIBUTING.md Gemfile Gemfile.lock LICENSE README.md VERSION config.yml.sample ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/ .endfor .for x in bin spec support .gitlab @${MKDIR} ${STAGEDIR}${DATADIR}/${x} (cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x}) .endfor @${MKDIR} ${STAGEDIR}${VARLOGDIR} .include Index: head/devel/gitlab-shell/distinfo =================================================================== --- head/devel/gitlab-shell/distinfo (revision 558916) +++ head/devel/gitlab-shell/distinfo (revision 558917) @@ -1,71 +1,71 @@ -TIMESTAMP = 1605917732 +TIMESTAMP = 1608587256 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 (client9-reopen-v1.0.0_GH0.tar.gz) = 64829db9b9fd0dd94b2444c45a2cb6e926b79c3a2e589a75a5edc2ba488a7875 SIZE (client9-reopen-v1.0.0_GH0.tar.gz) = 6283 SHA256 (HdrHistogram-hdrhistogram-go-3a0bb77429bd_GH0.tar.gz) = bf9c0b3bc04b0d4ed31e2019240a2854f650b87a383f47824f8af222e58a4001 SIZE (HdrHistogram-hdrhistogram-go-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 (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045 SIZE (go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732 SHA256 (golang-net-6afb5195e5aa_GH0.tar.gz) = e326d6b33545abf9db8bb622852d66e34f0957833e4c8839f8a01309b5aa263d SIZE (golang-net-6afb5195e5aa_GH0.tar.gz) = 1172285 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285 SHA256 (golang-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49 SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522 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 SIZE (google-go-genproto-ca5a22157cba_GH0.tar.gz) = 5960232 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-grpc-go-v1.24.0_GH0.tar.gz) = b8ac419ef6eb434e54e3900f0489bdda2f18d604e3f8c074b8ae75e6c106872b SIZE (grpc-grpc-go-v1.24.0_GH0.tar.gz) = 755074 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 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14 SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986 SHA256 (mattn-go-shellwords-2444a32a19f4_GH0.tar.gz) = 34a5c6349c3917583f4c69c41941891490fedbd34bd779139953282eb01b28c4 SIZE (mattn-go-shellwords-2444a32a19f4_GH0.tar.gz) = 4326 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 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 SHA256 (otiai10-copy-v1.0.1_GH0.tar.gz) = 44e2d330e53f7ae1088502a758a17131f5091fb86481228af8f25a27e1f241e7 SIZE (otiai10-copy-v1.0.1_GH0.tar.gz) = 3578 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.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356 SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009 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-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 SIZE (prometheus-procfs-v0.0.3_GH0.tar.gz) = 91880 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 (stretchr-testify-v1.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698 SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085 SHA256 (tinylib-msgp-v1.0.2_GH0.tar.gz) = 3769a1d074e1e8a1903d26c0cf36ad249848d3a0b2a78c20b8040cfd6ce3811f SIZE (tinylib-msgp-v1.0.2_GH0.tar.gz) = 68340 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-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = f2fdaf95afc348cbfe1b4445b5031bc67d2e808e4525db3dfb3a9e27c9adddf3 -SIZE (gitlab-org-gitlab-shell-3f9890ef73dced430d86801a1efc0e93ec50890e_GL0.tar.gz) = 89583 +SHA256 (gitlab-org-gitlab-shell-921712c8522d074afc8ba52d247f5165b5c26ec9_GL0.tar.gz) = 77edfc17682a38e72c62d5a34f3b5afce2d6f49478ef1a61ab685d32554bef12 +SIZE (gitlab-org-gitlab-shell-921712c8522d074afc8ba52d247f5165b5c26ec9_GL0.tar.gz) = 91892 SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 98d3cd87fb3feb8a14b5ac9e4a968e7a841cc3b309f997a2ba78aa8fd0b58c2d SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3143193 SHA256 (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 4aa5c67e6b864d3e52705ac4401f47286af9af88c00fa338ef22a451db617011 SIZE (gitlab-org-labkit-45895e1290291a2519678a847a24edb22880b9e6_GL0.tar.gz) = 66930 Index: head/devel/gitlab-shell/pkg-plist =================================================================== --- head/devel/gitlab-shell/pkg-plist (revision 558916) +++ head/devel/gitlab-shell/pkg-plist (revision 558917) @@ -1,32 +1,33 @@ %%DATADIR%%/.codeclimate.yml %%DATADIR%%/.gitignore %%DATADIR%%/.gitlab-ci.yml %%DATADIR%%/.ruby-version %%DATADIR%%/CHANGELOG %%DATADIR%%/CONTRIBUTING.md %%DATADIR%%/Gemfile %%DATADIR%%/Gemfile.lock %%DATADIR%%/LICENSE %%DATADIR%%/README.md %%DATADIR%%/VERSION %%DATADIR%%/.gitlab/CODEOWNERS @(,,555) %%DATADIR%%/bin/authorized_keys @(,,555) %%DATADIR%%/bin/check @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check @(,,555) %%DATADIR%%/bin/install @sample %%DATADIR%%/config.yml.sample %%DATADIR%%/spec/gitlab_shell_authorized_keys_check_spec.rb %%DATADIR%%/spec/gitlab_shell_authorized_principals_check_spec.rb %%DATADIR%%/spec/gitlab_shell_custom_git_receive_pack_spec.rb %%DATADIR%%/spec/gitlab_shell_custom_git_upload_pack_spec.rb %%DATADIR%%/spec/gitlab_shell_discover_spec.rb %%DATADIR%%/spec/gitlab_shell_lfs_authentication_spec.rb %%DATADIR%%/spec/gitlab_shell_personal_access_token_spec.rb %%DATADIR%%/spec/gitlab_shell_two_factor_recovery_spec.rb +%%DATADIR%%/spec/gitlab_shell_two_factor_verify_spec.rb %%DATADIR%%/spec/spec_helper.rb %%DATADIR%%/spec/support/gitlab_shell_setup.rb %%DATADIR%%/spec/support/http_unix_server.rb %%DATADIR%%/support/gitlab_config.rb %%DATADIR%%/support/truncate_repositories.sh