git: 0aa89e984490 - main - www/webhook: fix build on riscv64

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Sat, 11 Mar 2023 08:39:20 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0aa89e98449019de4f0814844d6ea030b773e453

commit 0aa89e98449019de4f0814844d6ea030b773e453
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-03-08 18:09:09 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-03-11 08:36:13 +0000

    www/webhook: fix build on riscv64
    
    Update golang.org/x/sys dependency to a version new enough to
    have the bits for riscv64-freebsd in there.
    
    While we are at it, remove ineffective GH_TUPLE entries (port
    has these vendored upstream).
    
    Sponsored by:   Berliner Linux User Group e.V.
    Approved by:    portmgr (build fix blanket)
---
 www/webhook/Makefile                       | 17 ++++++-----------
 www/webhook/distinfo                       | 22 +++-------------------
 www/webhook/files/patch-go.mod             | 29 +++++++++++++++++++++++++++++
 www/webhook/files/patch-go.sum             | 15 +++++++++++++++
 www/webhook/files/patch-vendor_modules.txt | 16 ++++++++++++++++
 5 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/www/webhook/Makefile b/www/webhook/Makefile
index 4c66bc7bb20c..c3ea551377e0 100644
--- a/www/webhook/Makefile
+++ b/www/webhook/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	webhook
 PORTVERSION=	2.8.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	www
 
 MAINTAINER=	stb@lassitu.de
@@ -13,16 +13,7 @@ LICENSE_COMB=	multi
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	adnanh
-GH_TUPLE=	\
-		clbanning:mxj:v1.8.4:clbanning_mxj/vendor/github.com/clbanning/mxj \
-		dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
-		fsnotify:fsnotify:v1.4.2:fsnotify_fsnotify/vendor/gopkg.in/fsnotify.v1 \
-		ghodss:yaml:v1.0.0:ghodss_yaml/vendor/github.com/ghodss/yaml \
-		go-chi:chi:v4.0.2:go_chi_chi/vendor/github.com/go-chi/chi \
-		go-yaml:yaml:eb3733d160e7:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		gofrs:uuid:v3.2.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
-		golang:sys:04cbcbbfeed8:golang_sys/vendor/golang.org/x/sys \
-		gorilla:mux:v1.7.3:gorilla_mux/vendor/github.com/gorilla/mux
+GH_TUPLE=	golang:sys:v0.5.0:golang_sys/vendor/golang.org/x/sys_
 
 USE_RC_SUBR=	webhook
 
@@ -40,6 +31,10 @@ DAEMONARGS=	-f
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${MV} ${WRKSRC}/vendor/golang.org/x/sys_ ${WRKSRC}/vendor/golang.org/x/sys
+
 post-install:
 	${INSTALL_DATA}  ${FILESDIR}/webhook.yaml ${STAGEDIR}${PREFIX}/etc/webhook.yaml.sample
 
diff --git a/www/webhook/distinfo b/www/webhook/distinfo
index 7dc4a824773e..d8ecc3930f7b 100644
--- a/www/webhook/distinfo
+++ b/www/webhook/distinfo
@@ -1,21 +1,5 @@
-TIMESTAMP = 1607248417
+TIMESTAMP = 1678298364
 SHA256 (adnanh-webhook-2.8.0_GH0.tar.gz) = c521558083f96bcefef16575a6f3f98ac79c0160fd0073be5e76d6645e068398
 SIZE (adnanh-webhook-2.8.0_GH0.tar.gz) = 1657141
-SHA256 (clbanning-mxj-v1.8.4_GH0.tar.gz) = 335fa9d17855c8540eca83fd8ecacc5979570fe15be04f7c1154f0b71f2c39c7
-SIZE (clbanning-mxj-v1.8.4_GH0.tar.gz) = 1091271
-SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
-SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260
-SHA256 (fsnotify-fsnotify-v1.4.2_GH0.tar.gz) = 4a1fd9beeb0496b9cf6084ac83654ece19188e9b2ffa041652d1071d4b225415
-SIZE (fsnotify-fsnotify-v1.4.2_GH0.tar.gz) = 29552
-SHA256 (ghodss-yaml-v1.0.0_GH0.tar.gz) = 8a76b47cd171944612aae1cfa08bbb971b63fec16794c839252808392097de44
-SIZE (ghodss-yaml-v1.0.0_GH0.tar.gz) = 11772
-SHA256 (go-chi-chi-v4.0.2_GH0.tar.gz) = 7713a5afd18c440f38e67f853f5ded4f039f08f239dc6a29ed2788be5caaae99
-SIZE (go-chi-chi-v4.0.2_GH0.tar.gz) = 67748
-SHA256 (go-yaml-yaml-eb3733d160e7_GH0.tar.gz) = af7d1783112db839a6d2719701b1f4965bfd9749dbffe3f0f8ce1cf5e46be201
-SIZE (go-yaml-yaml-eb3733d160e7_GH0.tar.gz) = 64708
-SHA256 (gofrs-uuid-v3.2.0_GH0.tar.gz) = 77d6e7d793bbc8835e082b590d0512ed177d6eba898bffb202d76ef97db57677
-SIZE (gofrs-uuid-v3.2.0_GH0.tar.gz) = 17064
-SHA256 (golang-sys-04cbcbbfeed8_GH0.tar.gz) = 8f194ecf5ac4834ba7e3543f38f67a8972ede9fee67e2142eb72644213335824
-SIZE (golang-sys-04cbcbbfeed8_GH0.tar.gz) = 1535773
-SHA256 (gorilla-mux-v1.7.3_GH0.tar.gz) = 92adb9aea022f8b35686b75be50ba1206c4457c2f8a0e2a9d10d8721f35b3f11
-SIZE (gorilla-mux-v1.7.3_GH0.tar.gz) = 42495
+SHA256 (golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (golang-sys-v0.5.0_GH0.tar.gz) = 1429723
diff --git a/www/webhook/files/patch-go.mod b/www/webhook/files/patch-go.mod
new file mode 100644
index 000000000000..0f159f07dba9
--- /dev/null
+++ b/www/webhook/files/patch-go.mod
@@ -0,0 +1,29 @@
+--- go.mod.orig	2023-03-08 18:02:22 UTC
++++ go.mod
+@@ -1,19 +1,22 @@
+ module github.com/adnanh/webhook
+ 
+-go 1.14
++go 1.17
+ 
+ require (
+ 	github.com/clbanning/mxj v1.8.4
+ 	github.com/dustin/go-humanize v1.0.0
+-	github.com/fsnotify/fsnotify v1.4.7 // indirect
+ 	github.com/ghodss/yaml v1.0.0
+ 	github.com/go-chi/chi v4.0.2+incompatible
+ 	github.com/gofrs/uuid v3.2.0+incompatible
+ 	github.com/gorilla/mux v1.7.3
++	golang.org/x/sys v0.5.0
++	gopkg.in/fsnotify.v1 v1.4.2
++)
++
++require (
++	github.com/fsnotify/fsnotify v1.4.7 // indirect
+ 	github.com/kr/pretty v0.1.0 // indirect
+ 	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
+-	golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8
+ 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+-	gopkg.in/fsnotify.v1 v1.4.2
+ 	gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7 // indirect
+ )
diff --git a/www/webhook/files/patch-go.sum b/www/webhook/files/patch-go.sum
new file mode 100644
index 000000000000..72d788027752
--- /dev/null
+++ b/www/webhook/files/patch-go.sum
@@ -0,0 +1,15 @@
+--- go.sum.orig	2023-03-08 18:02:26 UTC
++++ go.sum
+@@ -20,10 +20,11 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJe
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
+ golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8 h1:JA8d3MPx/IToSyXZG/RhwYEtfrKO1Fxrqe8KrkiLXKM=
+ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
diff --git a/www/webhook/files/patch-vendor_modules.txt b/www/webhook/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..8cd6b307a3be
--- /dev/null
+++ b/www/webhook/files/patch-vendor_modules.txt
@@ -0,0 +1,16 @@
+--- vendor/modules.txt.orig	2023-03-08 18:03:36 UTC
++++ vendor/modules.txt
+@@ -22,9 +22,10 @@ github.com/gorilla/mux
+ # github.com/kr/pretty v0.1.0
+ ## explicit
+ # golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+-## explicit
+-# golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8
+-## explicit
++## explicit; go 1.11
++# golang.org/x/sys v0.5.0
++## explicit; go 1.17
++golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+ # gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15