Date: Fri, 27 Dec 2019 15:33:02 +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: r520996 - head/devel/gitlab-shell Message-ID: <201912271533.xBRFX2IV062375@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Fri Dec 27 15:33:02 2019 New Revision: 520996 URL: https://svnweb.freebsd.org/changeset/ports/520996 Log: Update to 10.3.0, required for gitlab-ce 12.6.0. 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 Fri Dec 27 15:32:08 2019 (r520995) +++ head/devel/gitlab-shell/Makefile Fri Dec 27 15:33:02 2019 (r520996) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 10.2.0 +PORTVERSION= 10.3.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org @@ -19,7 +19,7 @@ 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= 9ed13ca8848b2020bbcd8a52120a58731730745a +GL_COMMIT= 24156ea1e31c1cac2471b57217e683de8dccbd46 BUILD_DEPENDS= rubygem-bundler1=1.17.3:sysutils/rubygem-bundler1 @@ -31,36 +31,38 @@ INSTALL_TARGET= install-strip # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-deps +# 30dd # Make sure you have here the path .../go/vendor/... and not .../vendor/... 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.2:go_yaml_yaml/go/vendor/gopkg.in/yaml.v2 \ - golang:crypto:20be4c3c3ed5:golang_crypto/go/vendor/golang.org/x/crypto \ - golang:net:d28f0bde5980:golang_net/go/vendor/golang.org/x/net \ - golang:protobuf:v1.3.2:golang_protobuf/go/vendor/github.com/golang/protobuf \ - golang:sys:953cdadca894: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.24.0:grpc_grpc_go/go/vendor/google.golang.org/grpc \ - konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/go/vendor/github.com/konsorten/go-windows-terminal-sequences \ - 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.2.0:sirupsen_logrus/go/vendor/github.com/sirupsen/logrus \ - stretchr:testify:v1.3.0:stretchr_testify/go/vendor/github.com/stretchr/testify \ - tinylib:msgp:v1.1.0: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 + DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ + 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 \ + go-yaml:yaml:v2.2.2:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + golang:crypto:20be4c3c3ed5:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \ + golang:protobuf:v1.3.2: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 \ + google:go-genproto:bd91e49a0898: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.1: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 \ + 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.0:pkg_errors/vendor/github.com/pkg/errors \ + pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ + sirupsen:logrus:v1.2.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 + GL_TUPLE= \ - gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_gitaly/go/vendor/gitlab.com/gitlab-org/gitaly \ - gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/go/vendor/gitlab.com/gitlab-org/labkit + gitlab-org:gitaly:aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb:gitlab_org_gitaly/vendor/gitlab.com/gitlab-org/gitaly \ + gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample @@ -68,8 +70,8 @@ post-patch: # Build the go deps, use `pkg install modules2tuple` gomod-deps: patch - (cd ${WRKSRC}/go && go mod vendor) - (cd ${WRKSRC}/go && modules2tuple -prefix go/vendor vendor/modules.txt) + (cd ${WRKSRC} && go mod vendor) + (cd ${WRKSRC} && modules2tuple -prefix vendor vendor/modules.txt) pre-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build) @@ -91,3 +93,4 @@ do-install: @${MKDIR} ${STAGEDIR}/var/log/gitlab-shell .include <bsd.port.mk> + Modified: head/devel/gitlab-shell/distinfo ============================================================================== --- head/devel/gitlab-shell/distinfo Fri Dec 27 15:32:08 2019 (r520995) +++ head/devel/gitlab-shell/distinfo Fri Dec 27 15:33:02 2019 (r520996) @@ -1,6 +1,6 @@ -TIMESTAMP = 1571857315 -SHA256 (DataDog-dd-trace-go-v1.9.0_GH0.tar.gz) = 923dfedb4d94e6ff32488fd444d1de5f7ee0c9dfa6da4ef3f21d9e199021e005 -SIZE (DataDog-dd-trace-go-v1.9.0_GH0.tar.gz) = 436588 +TIMESTAMP = 1576924857 +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 (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 @@ -49,8 +49,8 @@ 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-shell-9ed13ca8848b2020bbcd8a52120a58731730745a_GL0.tar.gz) = d9a9a527055d0c3b29bea193f12fbdbede6e0c9319aaa64d0d59791e738176a5 -SIZE (gitlab-org-gitlab-shell-9ed13ca8848b2020bbcd8a52120a58731730745a_GL0.tar.gz) = 60565 +SHA256 (gitlab-org-gitlab-shell-24156ea1e31c1cac2471b57217e683de8dccbd46_GL0.tar.gz) = a5200671317e8c486885d7229581843a3c04f7428be1cdeb7b30355211589814 +SIZE (gitlab-org-gitlab-shell-24156ea1e31c1cac2471b57217e683de8dccbd46_GL0.tar.gz) = 59992 SHA256 (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 717aaa0210924db6f537dbe06e6b373e687fb73ec11f1e0a9f6b12cf4dbc1ce1 SIZE (gitlab-org-gitaly-aa1ff2a76ac14e1ad3eca35cc05ea86ef59fffbb_GL0.tar.gz) = 2773612 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e Modified: head/devel/gitlab-shell/pkg-plist ============================================================================== --- head/devel/gitlab-shell/pkg-plist Fri Dec 27 15:32:08 2019 (r520995) +++ head/devel/gitlab-shell/pkg-plist Fri Dec 27 15:33:02 2019 (r520996) @@ -13,7 +13,6 @@ %%DATADIR%%/.gitlab/CODEOWNERS @(,,555) %%DATADIR%%/bin/authorized_keys @(,,555) %%DATADIR%%/bin/check -@(,,555) %%DATADIR%%/bin/compile @(,,555) %%DATADIR%%/bin/gitlab-shell @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-keys-check @(,,555) %%DATADIR%%/bin/gitlab-shell-authorized-principals-check @@ -32,8 +31,5 @@ %%DATADIR%%/spec/support/gitlab_shell_setup.rb %%DATADIR%%/spec/support/http_unix_server.rb %%DATADIR%%/support/gitlab_config.rb -%%DATADIR%%/support/go-format -%%DATADIR%%/support/go-test -%%DATADIR%%/support/go_build.rb %%DATADIR%%/support/truncate_repositories.sh @dir(git,,755) /var/log/gitlab-shell
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912271533.xBRFX2IV062375>