Date: Thu, 4 Jun 2020 19:59:48 +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: r537949 - in head/devel/gitlab-shell: . files Message-ID: <202006041959.054JxmlQ050497@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Thu Jun 4 19:59:47 2020 New Revision: 537949 URL: https://svnweb.freebsd.org/changeset/ports/537949 Log: Update to 13.3.0 which is required for gitlab-ce 13.0. Modified: head/devel/gitlab-shell/Makefile head/devel/gitlab-shell/distinfo head/devel/gitlab-shell/files/patch-config.yml.example Modified: head/devel/gitlab-shell/Makefile ============================================================================== --- head/devel/gitlab-shell/Makefile Thu Jun 4 19:59:04 2020 (r537948) +++ head/devel/gitlab-shell/Makefile Thu Jun 4 19:59:47 2020 (r537949) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-shell -PORTVERSION= 12.2.0 +PORTVERSION= 13.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= 3e73101ada44b2f65ea1eb14d243fe1daf074692 +GL_COMMIT= 131771a66fb9f0366d31f20229358820f3bfa07b BUILD_DEPENDS= rubygem-bundler1=1.17.3:sysutils/rubygem-bundler1 @@ -31,37 +31,39 @@ INSTALL_TARGET= install-strip # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-deps -# 29dd +# 31dd # 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 \ + 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 \ - 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 \ + go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ + golang:crypto:87dc89f01550:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:6afb5195e5aa: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 \ + golang:sys:86b910548bc1:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.2: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.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ + 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 \ 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 \ + 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 \ - sirupsen:logrus:v1.2.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - stretchr:testify:v1.3.0:stretchr_testify/vendor/github.com/stretchr/testify \ + 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.4.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/vendor/gitlab.com/gitlab-org/gitaly \ - gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit + gitlab-org:labkit:0149780c759d60f61fcfe1648fb882ba7ec41f3f:gitlab_org_labkit/vendor/gitlab.com/gitlab-org/labkit post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample Modified: head/devel/gitlab-shell/distinfo ============================================================================== --- head/devel/gitlab-shell/distinfo Thu Jun 4 19:59:04 2020 (r537948) +++ head/devel/gitlab-shell/distinfo Thu Jun 4 19:59:47 2020 (r537949) @@ -1,30 +1,32 @@ -TIMESTAMP = 1587535259 +TIMESTAMP = 1591100722 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 (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 (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 42c3e4ef9eca2860d22b3c6c5582c6c13fb4b417e5ebc1acc56ee5e2c4ddcaff -SIZE (go-yaml-yaml-v2.2.2_GH0.tar.gz) = 70656 -SHA256 (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = bc78136186ecd1683395d9094a7b973cb01675529131ac59f484e2716609de6f -SIZE (golang-crypto-20be4c3c3ed5_GH0.tar.gz) = 1690016 -SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b315f4a6867ab5beadf4d73f93b9c1d777b48ec66d59f953a4a19acb4 -SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062 +SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c +SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209 +SHA256 (golang-crypto-87dc89f01550_GH0.tar.gz) = d81e26d345c6cd9f132fd69547b14200603d6f3b50622ebceace32dfe456339b +SIZE (golang-crypto-87dc89f01550_GH0.tar.gz) = 1709204 +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-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 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377 -SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775 +SHA256 (golang-sys-86b910548bc1_GH0.tar.gz) = d078511490f41a676d909de4f1a319ea332819b72c527f4ea735313cc9391e49 +SIZE (golang-sys-86b910548bc1_GH0.tar.gz) = 1534522 +SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22 +SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069 +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.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87 -SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909 +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 (mattn-go-shellwords-2444a32a19f4_GH0.tar.gz) = 34a5c6349c3917583f4c69c41941891490fedbd34bd779139953282eb01b28c4 @@ -35,23 +37,25 @@ SHA256 (otiai10-copy-v1.0.1_GH0.tar.gz) = 44e2d330e53f 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 (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 (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 679aa05d23ca81b74f1327e7a25267a322dc9fd807a276e73e781f62ee679c6d -SIZE (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 37794 -SHA256 (stretchr-testify-v1.3.0_GH0.tar.gz) = 0cd9c199a72b8d80621624b37c0ed5ac724352d458506a31dfa86710551e7fc5 -SIZE (stretchr-testify-v1.3.0_GH0.tar.gz) = 102859 +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.4.0_GH0.tar.gz) = 3ae072321569a8cd6d77de8f3be774165e136198ce808df0a31589237ba59698 +SIZE (stretchr-testify-v1.4.0_GH0.tar.gz) = 110085 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-shell-3e73101ada44b2f65ea1eb14d243fe1daf074692_GL0.tar.gz) = 05b37dc478b228cd950366424e3032dd2de274b10786fed03c7a42e15a5ebdc1 -SIZE (gitlab-org-gitlab-shell-3e73101ada44b2f65ea1eb14d243fe1daf074692_GL0.tar.gz) = 64815 +SHA256 (gitlab-org-gitlab-shell-131771a66fb9f0366d31f20229358820f3bfa07b_GL0.tar.gz) = 28802e209d370a432956dba0d51749962d63db47c9416bccc0f9bfb044b9871d +SIZE (gitlab-org-gitlab-shell-131771a66fb9f0366d31f20229358820f3bfa07b_GL0.tar.gz) = 78343 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 -SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 +SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95 +SIZE (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = 3671144 Modified: head/devel/gitlab-shell/files/patch-config.yml.example ============================================================================== --- head/devel/gitlab-shell/files/patch-config.yml.example Thu Jun 4 19:59:04 2020 (r537948) +++ head/devel/gitlab-shell/files/patch-config.yml.example Thu Jun 4 19:59:47 2020 (r537949) @@ -1,5 +1,14 @@ ---- config.yml.example.orig 2018-11-28 23:06:49 UTC +--- config.yml.example.orig 2020-06-01 04:40:32 UTC +++ config.yml.example +@@ -13,7 +13,7 @@ user: git + # only listen on a Unix domain socket. For Unix domain sockets use + # "http+unix://<urlquoted-path-to-socket>", e.g. + # "http+unix://%2Fpath%2Fto%2Fsocket" +-gitlab_url: "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" ++gitlab_url: "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" + + # See installation.md#using-https for additional HTTPS configuration details. + http_settings: @@ -25,7 +25,7 @@ http_settings: self_signed_cert: false @@ -9,7 +18,7 @@ # File that contains the secret key for verifying access to GitLab. # Default is .gitlab_shell_secret in the gitlab-shell directory. -@@ -37,7 +37,7 @@ auth_file: "/home/git/.ssh/authorized_keys" +@@ -33,7 +33,7 @@ auth_file: "/home/git/.ssh/authorized_keys" # Log file. # Default is gitlab-shell.log in the root directory.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006041959.054JxmlQ050497>