Date: Mon, 30 Sep 2019 22:46:06 +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: r513439 - head/devel/gitlab-shell Message-ID: <201909302246.x8UMk6qE064867@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Mon Sep 30 22:46:05 2019 New Revision: 513439 URL: https://svnweb.freebsd.org/changeset/ports/513439 Log: devel/gitlab-shell: upgrade to 10.0.0 which is required for gitlab-ce 12.3 upgrade. Thanks to: swills to help fixing some problem while upgrading this port. Modified: head/devel/gitlab-shell/Makefile head/devel/gitlab-shell/distinfo head/devel/gitlab-shell/pkg-plist Modified: head/devel/gitlab-shell/Makefile ============================================================================== --- head/devel/gitlab-shell/Makefile Mon Sep 30 22:44:34 2019 (r513438) +++ head/devel/gitlab-shell/Makefile Mon Sep 30 22:46:05 2019 (r513439) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 9.3.0 +PORTVERSION= 10.0.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -12,31 +12,82 @@ LICENSE= MIT BUILD_DEPENDS= gem:devel/ruby-gems -USES= go +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= 58c981045ce126d23ed0f50616fbfb9b795f62b4 +GL_COMMIT= 996b2e1d44cc671cc60fd4ddacd2c5750b72a025 USERS= git GROUPS= git -INSTALL_TARGET=install-strip +INSTALL_TARGET= install-strip +# for go dependencies +USE_GITHUB= nodefault +# generated with gomod-deps below +GH_TUPLE= \ + DataDog:dd-trace-go:v1.9.0:datadog_dd_trace_go/go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ + codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/go/vendor/github.com/codahale/hdrhistogram \ + davecgh:go-spew:v1.1.1:davecgh_go_spew/go/vendor/github.com/davecgh/go-spew \ + go-yaml:yaml:v2.2.1:go_yaml_yaml/go/vendor/gopkg.in/yaml.v2 \ + golang:crypto:182114d58262:golang_crypto/go/vendor/golang.org/x/crypto \ + golang:net:10aee1819953:golang_net/go/vendor/golang.org/x/net \ + golang:protobuf:v1.2.0:golang_protobuf/go/vendor/github.com/golang/protobuf \ + golang:sys:70b957f3b65e:golang_sys/go/vendor/golang.org/x/sys \ + golang:text:v0.3.0:golang_text/go/vendor/golang.org/x/text \ + google:go-genproto:bd91e49a0898:google_go_genproto/go/vendor/google.golang.org/genproto \ + grpc-ecosystem:go-grpc-middleware:v1.0.0:grpc_ecosystem_go_grpc_middleware/go/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ + grpc:grpc-go:v1.16.0:grpc_grpc_go/go/vendor/google.golang.org/grpc \ + lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/go/vendor/github.com/lightstep/lightstep-tracer-go \ + mattn:go-shellwords:2444a32a19f4:mattn_go_shellwords/go/vendor/github.com/mattn/go-shellwords \ + opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/go/vendor/github.com/opentracing/opentracing-go \ + otiai10:copy:v1.0.1:otiai10_copy/go/vendor/github.com/otiai10/copy \ + philhofer:fwd:v1.0.0:philhofer_fwd/go/vendor/github.com/philhofer/fwd \ + pkg:errors:v0.8.0:pkg_errors/go/vendor/github.com/pkg/errors \ + pmezard:go-difflib:v1.0.0:pmezard_go_difflib/go/vendor/github.com/pmezard/go-difflib \ + sirupsen:logrus:v1.0.5:sirupsen_logrus/go/vendor/github.com/sirupsen/logrus \ + stretchr:testify:v1.2.2:stretchr_testify/go/vendor/github.com/stretchr/testify \ + tinylib:msgp:v1.0.2:tinylib_msgp/go/vendor/github.com/tinylib/msgp \ + uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/go/vendor/github.com/uber/jaeger-client-go \ + uber:jaeger-lib:v1.5.0:uber_jaeger_lib/go/vendor/github.com/uber/jaeger-lib +GL_TUPLE= \ + gitlab-org:gitaly-proto:53d58cd1f691f0370aca152927db89a6b6fbab59:gitlab_org_gitaly_proto/go/vendor/gitlab.com/gitlab-org/gitaly-proto \ + gitlab-org:gitaly:52d67af596f75e82305f16ff0f27a9e0e77d57e1:gitlab_org_gitaly/go/vendor/gitlab.com/gitlab-org/gitaly \ + gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/go/vendor/gitlab.com/gitlab-org/labkit + post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample + ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml -do-build: - ${SETENV} ${MAKE_ENV} ${GO_ENV} ${WRKSRC}/bin/compile +# Build the go deps, use `pkg install modules2tuple` +gomod-deps: patch + (cd ${WRKSRC}/go && go mod vendor) + (cd ${WRKSRC}/go && modules2tuple vendor/modules.txt) +#export GOCACHE=${WRKSRC}/go && ${WRKSRC}/bin/compile +pre-build: + (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} bin/compile) + @(cd ${WRKSRC}; ${MAKE_CMD} build) + @(cd ${WRKSRC}; ${MAKE_CMD} compile) + pre-install: - ${RM} -rf ${WRKSRC}/go - ${RM} -rf ${WRKSRC}/go_build + ${RM} -rf ${WRKSRC}/config.yml + #${RM} -rf ${WRKSRC}/go_build do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) +.for x in .codeclimate.yml .gitignore .gitlab-ci.yml .rubocop.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 lib hooks support .gitlab + @${MKDIR} ${STAGEDIR}${DATADIR}/${x} + (cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x}) +.endfor + @${MKDIR} ${STAGEDIR}/var/log/gitlab-shell .include <bsd.port.mk> Modified: head/devel/gitlab-shell/distinfo ============================================================================== --- head/devel/gitlab-shell/distinfo Mon Sep 30 22:44:34 2019 (r513438) +++ head/devel/gitlab-shell/distinfo Mon Sep 30 22:46:05 2019 (r513439) @@ -1,3 +1,57 @@ -TIMESTAMP = 1561193926 -SHA256 (gitlab-org-gitlab-shell-58c981045ce126d23ed0f50616fbfb9b795f62b4_GL0.tar.gz) = 324f7ba31e5ab3fd910c2c35e58404c0da9edcb05f000a929d4a2bd107668201 -SIZE (gitlab-org-gitlab-shell-58c981045ce126d23ed0f50616fbfb9b795f62b4_GL0.tar.gz) = 2217977 +TIMESTAMP = 1569854307 +SHA256 (DataDog-dd-trace-go-v1.9.0_GH0.tar.gz) = 923dfedb4d94e6ff32488fd444d1de5f7ee0c9dfa6da4ef3f21d9e199021e005 +SIZE (DataDog-dd-trace-go-v1.9.0_GH0.tar.gz) = 436588 +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 (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 33218aa3bd60a307fe14e66b970473cb411bb6ca3d4f4a5e30c97b44f9b4e84b +SIZE (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 70217 +SHA256 (golang-crypto-182114d58262_GH0.tar.gz) = 103ee3825d51535105e14db9337202e65b99f97e06648de44cbe0155a93a16b6 +SIZE (golang-crypto-182114d58262_GH0.tar.gz) = 1451246 +SHA256 (golang-net-10aee1819953_GH0.tar.gz) = 5dc6670030f663160c5a018e928d713e8eda9f16ccf3d1f4b014148586058d19 +SIZE (golang-net-10aee1819953_GH0.tar.gz) = 967363 +SHA256 (golang-protobuf-v1.2.0_GH0.tar.gz) = 157a148ae4e132eb169ec794b6cb43f1002780eeacaea8b0694811d1948fb1ec +SIZE (golang-protobuf-v1.2.0_GH0.tar.gz) = 332565 +SHA256 (golang-sys-70b957f3b65e_GH0.tar.gz) = c3913b484358c3eacb5eb8dbfd25d93dd49249bf2f20fbe2b0b96d1755c8ae3d +SIZE (golang-sys-70b957f3b65e_GH0.tar.gz) = 1119411 +SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb +SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 +SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377 +SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775 +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.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a +SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087 +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 (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.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 (sirupsen-logrus-v1.0.5_GH0.tar.gz) = 0c422c0f06eb8a67a7c3ce6814d92b866e47b88ad33948c6c009f48ccfbe935f +SIZE (sirupsen-logrus-v1.0.5_GH0.tar.gz) = 28746 +SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f +SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 +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-996b2e1d44cc671cc60fd4ddacd2c5750b72a025_GL0.tar.gz) = d5c9bd16ee28e329b0c6705efcca0fc4c0009e2c56116f1f5f9c86e9af9d6638 +SIZE (gitlab-org-gitlab-shell-996b2e1d44cc671cc60fd4ddacd2c5750b72a025_GL0.tar.gz) = 87799 +SHA256 (gitlab-org-gitaly-proto-53d58cd1f691f0370aca152927db89a6b6fbab59_GL0.tar.gz) = df5509fc4c8384d9541f30ef0826e4c929e72b86a44bde9a030fd0ccd4b7247b +SIZE (gitlab-org-gitaly-proto-53d58cd1f691f0370aca152927db89a6b6fbab59_GL0.tar.gz) = 127622 +SHA256 (gitlab-org-gitaly-52d67af596f75e82305f16ff0f27a9e0e77d57e1_GL0.tar.gz) = e6bda13673548eec3938f15ee3762feaa741f726b490135e137df302f4ce83d6 +SIZE (gitlab-org-gitaly-52d67af596f75e82305f16ff0f27a9e0e77d57e1_GL0.tar.gz) = 4257639 +SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e +SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 Modified: head/devel/gitlab-shell/pkg-plist ============================================================================== --- head/devel/gitlab-shell/pkg-plist Mon Sep 30 22:44:34 2019 (r513438) +++ head/devel/gitlab-shell/pkg-plist Mon Sep 30 22:46:05 2019 (r513439) @@ -18,10 +18,11 @@ @(,,555) %%DATADIR%%/bin/gitaly-upload-archive @(,,555) %%DATADIR%%/bin/gitaly-upload-pack @(,,555) %%DATADIR%%/bin/gitaly-receive-pack -@(,,555) %%DATADIR%%/bin/gitlab-keys @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check +@(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check-ruby @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check +@(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check-ruby @(,,555) %%DATADIR%%/bin/gitlab-shell-ruby @(,,555) %%DATADIR%%/bin/install @(,,555) %%DATADIR%%/bin/test-logger @@ -55,6 +56,7 @@ %%DATADIR%%/spec/gitlab_metrics_spec.rb %%DATADIR%%/spec/gitlab_net_spec.rb %%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_gitlab_shell_spec.rb %%DATADIR%%/spec/gitlab_shell_lfs_authentication_spec.rb @@ -67,7 +69,6 @@ %%DATADIR%%/spec/support/gitlab_shell_setup.rb %%DATADIR%%/spec/support/gl_id_test_hook %%DATADIR%%/spec/support/http_unix_server.rb -%%DATADIR%%/support/go-update-vendor %%DATADIR%%/spec/support/hook_fail %%DATADIR%%/spec/support/hook_ok %%DATADIR%%/spec/support/vcr.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909302246.x8UMk6qE064867>