Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2019 15:03:54 +0000 (UTC)
From:      Matthias Fechner <mfechner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r516426 - branches/2019Q4/devel/gitaly
Message-ID:  <201911031503.xA3F3svc040001@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Sun Nov  3 15:03:54 2019
New Revision: 516426
URL: https://svnweb.freebsd.org/changeset/ports/516426

Log:
  MFH: r515487
  
  devel/gitaly: upgrade to 1.67.0 which is required for gitlab-ce 12.4 upgrade.
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2019Q4/devel/gitaly/Makefile
  branches/2019Q4/devel/gitaly/distinfo
  branches/2019Q4/devel/gitaly/pkg-plist
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/devel/gitaly/Makefile
==============================================================================
--- branches/2019Q4/devel/gitaly/Makefile	Sun Nov  3 15:03:05 2019	(r516425)
+++ branches/2019Q4/devel/gitaly/Makefile	Sun Nov  3 15:03:54 2019	(r516426)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitaly
-DISTVERSION=	1.65.1
+DISTVERSION=	1.67.0
 PORTREVISION=	0
 CATEGORIES=	devel
 
@@ -41,11 +41,11 @@ MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 # Find this here: https://gitlab.com/gitlab-org/gitaly/tags
-GL_COMMIT=	11980609ad78842b5cf83899d1bb002bbbe9ba2d
+GL_COMMIT=	ca21a624582be7bcf4d43075be2a7e5981e191fa
 
 # for go dependencies
 USE_GITHUB=	nodefault
-# generated with gomod-deps below
+# generated with: make gomod-vendor
 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 \
@@ -55,6 +55,7 @@ GH_TUPLE=	\
 		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 \
 		getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \
+		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.1:golang_protobuf/vendor/github.com/golang/protobuf \
@@ -91,11 +92,6 @@ post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
 	${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
 
-# Build the go deps, use `pkg install modules2tuple`
-gomod-deps: patch
-	(cd ${WRKSRC} && go mod vendor)
-	(cd ${WRKSRC} && modules2tuple vendor/modules.txt)
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
@@ -106,3 +102,4 @@ do-install:
 	cd ${WRKSRC}/ruby && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ruby
 
 .include <bsd.port.mk>
+

Modified: branches/2019Q4/devel/gitaly/distinfo
==============================================================================
--- branches/2019Q4/devel/gitaly/distinfo	Sun Nov  3 15:03:05 2019	(r516425)
+++ branches/2019Q4/devel/gitaly/distinfo	Sun Nov  3 15:03:54 2019	(r516426)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1569914858
+TIMESTAMP = 1571855950
 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
@@ -15,6 +15,8 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5
 SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314
+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
@@ -73,7 +75,7 @@ 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-gitaly-11980609ad78842b5cf83899d1bb002bbbe9ba2d_GL0.tar.gz) = 5ed966452dd45681d4b7ce66a2118284f4a9c5b41a0fd73e9df27013eb4ce011
-SIZE (gitlab-org-gitaly-11980609ad78842b5cf83899d1bb002bbbe9ba2d_GL0.tar.gz) = 2749759
+SHA256 (gitlab-org-gitaly-ca21a624582be7bcf4d43075be2a7e5981e191fa_GL0.tar.gz) = 92d38de0294338d8b9bb27205f799c60b5bed2e0ac651a87029fc203301a688a
+SIZE (gitlab-org-gitaly-ca21a624582be7bcf4d43075be2a7e5981e191fa_GL0.tar.gz) = 2772214
 SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e
 SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466

Modified: branches/2019Q4/devel/gitaly/pkg-plist
==============================================================================
--- branches/2019Q4/devel/gitaly/pkg-plist	Sun Nov  3 15:03:05 2019	(r516425)
+++ branches/2019Q4/devel/gitaly/pkg-plist	Sun Nov  3 15:03:54 2019	(r516426)
@@ -231,6 +231,7 @@
 @(,,555) %%DATADIR%%/ruby/gitlab-shell/hooks/update
 @(,,555) %%DATADIR%%/bin/gitaly
 @(,,555) %%DATADIR%%/bin/gitaly-debug
+@(,,555) %%DATADIR%%/bin/gitaly-hooks
 @(,,555) %%DATADIR%%/bin/gitaly-ssh
 @(,,555) %%DATADIR%%/bin/gitaly-wrapper
 @(,,555) %%DATADIR%%/bin/praefect



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911031503.xA3F3svc040001>