Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Feb 2020 08:48:04 +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: r525469 - in head/www/gitlab-workhorse: . files
Message-ID:  <202002070848.0178m4Bl027051@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mfechner
Date: Fri Feb  7 08:48:03 2020
New Revision: 525469
URL: https://svnweb.freebsd.org/changeset/ports/525469

Log:
  Fixed build for aarch64.
  This problem was send upstream here:
  https://gitlab.com/gitlab-org/gitlab-workhorse/issues/246
  
  And will be corrected with this merge request:
  https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/456
  
  After the merge request reached the next stable version the two patches:
  gitlab-workhorse/files/patch-go.mod
  gitlab-workhorse/files/patch-go.sum
  
  can be removed again.
  
  PR:		243804
  Reported by:	mikael@FreeBSD.org

Added:
  head/www/gitlab-workhorse/files/
  head/www/gitlab-workhorse/files/patch-go.mod   (contents, props changed)
  head/www/gitlab-workhorse/files/patch-go.sum   (contents, props changed)
Modified:
  head/www/gitlab-workhorse/Makefile
  head/www/gitlab-workhorse/distinfo

Modified: head/www/gitlab-workhorse/Makefile
==============================================================================
--- head/www/gitlab-workhorse/Makefile	Fri Feb  7 08:24:00 2020	(r525468)
+++ head/www/gitlab-workhorse/Makefile	Fri Feb  7 08:48:03 2020	(r525469)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gitlab-workhorse
 PORTVERSION=	8.20.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -43,7 +44,7 @@ GH_TUPLE=	\
 		golang:lint:d0100b6bd8b3:golang_lint/vendor/golang.org/x/lint \
 		golang:net:d28f0bde5980:golang_net/vendor/golang.org/x/net \
 		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:fde4db37ae7a:golang_sys/vendor/golang.org/x/sys \
+		golang:sys:d101bd2416d5:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \
 		golang:tools:6e04913cbbac:golang_tools/vendor/golang.org/x/tools \
 		gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \

Modified: head/www/gitlab-workhorse/distinfo
==============================================================================
--- head/www/gitlab-workhorse/distinfo	Fri Feb  7 08:24:00 2020	(r525468)
+++ head/www/gitlab-workhorse/distinfo	Fri Feb  7 08:48:03 2020	(r525469)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1580459883
+TIMESTAMP = 1581022516
 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
@@ -31,8 +31,8 @@ SHA256 (golang-net-d28f0bde5980_GH0.tar.gz) = 40f4d37b
 SIZE (golang-net-d28f0bde5980_GH0.tar.gz) = 1097062
 SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
 SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
-SHA256 (golang-sys-fde4db37ae7a_GH0.tar.gz) = b6aab4e92d5d8fe85ca0dd229bfb75c91290951a3bf3b95087459e5a4eae86a4
-SIZE (golang-sys-fde4db37ae7a_GH0.tar.gz) = 1455218
+SHA256 (golang-sys-d101bd2416d5_GH0.tar.gz) = c1de80d233d3df630ed34bf80cbb3f186199e7b5218726abe0234520c8eddb8b
+SIZE (golang-sys-d101bd2416d5_GH0.tar.gz) = 1537146
 SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
 SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
 SHA256 (golang-tools-6e04913cbbac_GH0.tar.gz) = 76c1e182745c99749e4b6b46cf8486244ab2aa9be689f41d827d67a4221977c1

Added: head/www/gitlab-workhorse/files/patch-go.mod
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gitlab-workhorse/files/patch-go.mod	Fri Feb  7 08:48:03 2020	(r525469)
@@ -0,0 +1,10 @@
+--- go.mod.orig	2020-02-06 20:48:09 UTC
++++ go.mod
+@@ -25,6 +25,7 @@ require (
+ 	gitlab.com/gitlab-org/labkit v0.0.0-20190902063225-3253d7975ca7
+ 	golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
+ 	golang.org/x/net v0.0.0-20190613194153-d28f0bde5980
++	golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 // indirect
+ 	golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac
+ 	google.golang.org/grpc v1.24.0
+ 	honnef.co/go/tools v0.0.1-2019.2.2

Added: head/www/gitlab-workhorse/files/patch-go.sum
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gitlab-workhorse/files/patch-go.sum	Fri Feb  7 08:48:03 2020	(r525469)
@@ -0,0 +1,11 @@
+--- go.sum.orig	2020-02-06 20:48:35 UTC
++++ go.sum
+@@ -259,6 +259,8 @@ golang.org/x/sys v0.0.0-20190306220723-b294cbcfc56d/go
+ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
+ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
++golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=



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