From nobody Mon Mar 27 11:27:09 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PlVsB0GrFz4289K; Mon, 27 Mar 2023 11:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PlVs95GCLz3Khc; Mon, 27 Mar 2023 11:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/s/MbOCbBewPquW/NbQSNxh048X4qQBjCbcek/CrTQ=; b=GsjzybGMO6OKhrLTWAFH/N1/bJRvU5hXJMO1cSd4wMQVZheKjuu9AImyvj6IC1FHXKfE+n ifWf6zjOCDuQfvdfssyrx5LfYw1gl4fx7ipQ2QPwUaNLHoQwmXD5MV3+J23cOAJIvIL/kj fVjJGeWPMSCH6GnbCL/pAMcXAFZe+rptp8nXIphY96z2CYKeDT8bU6zi3/lRzOXsTXDGL9 /w1Sv9R5z/TIX1fTOrZwgcsSwS8NMgBYFh0CwTaaLV/T+1/xpbHLMPoEkkk3W41o0ycAo5 qwDwVk2dPpwmojPPwktJD27eblTHg9rQxlb8J6TM+IsAqgnZFyiSy5Sn3apQ7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679916429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/s/MbOCbBewPquW/NbQSNxh048X4qQBjCbcek/CrTQ=; b=BSsqDxUs5q8EHAyk/pOshhtwbyN2TW16ESByEeCFbJPhVw8GSrLY78ROIFNW9dg7OmHatt ySNBYxz0URCvAhmWLJPOaoBya78FDCanoT/2FKRxXITJANoL0aKfJQiWmAiy97+0fPWSLv 0qJLDv5qSLTRSVArwadUkl+TIZ7aGQv6A+Kv2gA/e+kBRSR6MfDP236+m+VbHjj2iQf8c3 rL0wJU315IS6S87vhiNl40WjJk9zIOm6DX43jP1Y05yPSBmhIFDHj8HMEzVH+ApFbx4Lbp HqGg5stQxhJ3+MqLHmTFPcG4RNBRFFUU4I2HYcD7yESmP8QlvSKuliZGXMMSfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679916429; a=rsa-sha256; cv=none; b=rhLh8rSh+7conADbiN+1G98XsC8dWE7F4mrnbKQ8QiaVSONi0sxhk6EGXpE9gr0M60+/1M Q5zlvZ++PtnwKwlsGTbPAFITT3J7OAz1/bqb19d2FaiqDoTNlshc27Y8tIBwy8hDDgDA1F 1oyz/n9ZqGNiJJeukj3CR1tB75yplBoB11oTFkZnKqRaguPhXiM4wuKVbZ5kvVl8MAjU8T dADL/RNPE5EHMP7QlKo2V0uVaxhsmuKFMAG0FbM5cGy/2CXRm8AIthzsInZTxCGLrdsOWf jz/67RQ+m/Lf5Rk1pEoj0HKICC+DygAh2pcs299wGkLNjjbJsrvufnD90pYQSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PlVs94JfPzL5q; Mon, 27 Mar 2023 11:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32RBR9eG058439; Mon, 27 Mar 2023 11:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32RBR9T4058438; Mon, 27 Mar 2023 11:27:09 GMT (envelope-from git) Date: Mon, 27 Mar 2023 11:27:09 GMT Message-Id: <202303271127.32RBR9T4058438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: ed5a244f11f4 - main - net/librespeed-cli: fix build on riscv64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed5a244f11f49e04328a16fa22bc3415ceed1a68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ed5a244f11f49e04328a16fa22bc3415ceed1a68 commit ed5a244f11f49e04328a16fa22bc3415ceed1a68 Author: Robert Clausecker AuthorDate: 2023-03-24 21:36:18 +0000 Commit: Robert Clausecker CommitDate: 2023-03-27 11:24:55 +0000 net/librespeed-cli: fix build on riscv64 Bump golang.org/x/{net,sys} dependencies to versions new enough to support riscv64-freebsd. Sponsored by: Berliner Linux User Group e.V. Approved by: portmgr (build fix blanket) --- net/librespeed-cli/Makefile | 9 ++++ net/librespeed-cli/distinfo | 6 ++- net/librespeed-cli/files/patch-go.mod | 32 ++++++++++++ net/librespeed-cli/files/patch-go.sum | 20 ++++++++ net/librespeed-cli/files/patch-vendor_modules.txt | 59 +++++++++++++++++++++++ 5 files changed, 125 insertions(+), 1 deletion(-) diff --git a/net/librespeed-cli/Makefile b/net/librespeed-cli/Makefile index f6369f14d01b..ecc01b367854 100644 --- a/net/librespeed-cli/Makefile +++ b/net/librespeed-cli/Makefile @@ -12,6 +12,9 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules +USE_GITHUB= nodefault +GH_TUPLE= golang:net:v0.8.0:net \ + golang:sys:v0.6.0:sys GO_MODULE= github.com/librespeed/speedtest-cli GO_BUILDFLAGS+= -ldflags "-X \"librespeed-cli/defs.ProgName=${PORTNAME}\" \ @@ -20,4 +23,10 @@ GO_BUILDFLAGS+= -ldflags "-X \"librespeed-cli/defs.ProgName=${PORTNAME}\" \ PLIST_FILES= bin/librespeed-cli +pre-patch: +.for m in net sys + ${RM} -r ${WRKSRC}/vendor/golang.org/x/$m + ${LN} -s ${WRKDIR}/$m-* ${WRKSRC}/vendor/golang.org/x/$m +.endfor + .include diff --git a/net/librespeed-cli/distinfo b/net/librespeed-cli/distinfo index b81f30738612..529e412516cc 100644 --- a/net/librespeed-cli/distinfo +++ b/net/librespeed-cli/distinfo @@ -1,5 +1,9 @@ -TIMESTAMP = 1657306529 +TIMESTAMP = 1679693757 SHA256 (go/net_librespeed-cli/librespeed-cli-v1.0.10/v1.0.10.mod) = 0564307c5ba5746b08372cf21d82f91a50af3a5aa5f463ec849c8e9cf7eadc1e SIZE (go/net_librespeed-cli/librespeed-cli-v1.0.10/v1.0.10.mod) = 624 SHA256 (go/net_librespeed-cli/librespeed-cli-v1.0.10/v1.0.10.zip) = b8015d4d63ca2a0660255b85ec22a39c9d09386f784c6713316a120435ee4487 SIZE (go/net_librespeed-cli/librespeed-cli-v1.0.10/v1.0.10.zip) = 31726 +SHA256 (go/net_librespeed-cli/librespeed-cli-v1.0.10/golang-net-v0.8.0_GH0.tar.gz) = f9e2128a2d6861db0595428c7cce62fe5a131348a6c7651b6efa8b03d0b10831 +SIZE (go/net_librespeed-cli/librespeed-cli-v1.0.10/golang-net-v0.8.0_GH0.tar.gz) = 1244302 +SHA256 (go/net_librespeed-cli/librespeed-cli-v1.0.10/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/net_librespeed-cli/librespeed-cli-v1.0.10/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/net/librespeed-cli/files/patch-go.mod b/net/librespeed-cli/files/patch-go.mod new file mode 100644 index 000000000000..ede36f4178be --- /dev/null +++ b/net/librespeed-cli/files/patch-go.mod @@ -0,0 +1,32 @@ +--- go.mod.orig 2023-03-24 21:32:43 UTC ++++ go.mod +@@ -1,17 +1,22 @@ + module github.com/librespeed/speedtest-cli + +-go 1.14 ++go 1.17 + + require ( + github.com/briandowns/spinner v1.12.0 +- github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect +- github.com/fatih/color v1.10.0 // indirect + github.com/go-ping/ping v0.0.0-20210407214646-e4e642a95741 + github.com/gocarina/gocsv v0.0.0-20210408192840-02d7211d929d +- github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/sirupsen/logrus v1.8.1 +- github.com/stretchr/testify v1.3.0 // indirect + github.com/urfave/cli/v2 v2.3.0 +- golang.org/x/net v0.0.0-20210421230115-4e50805a0758 // indirect +- golang.org/x/sys v0.0.0-20210421221651-33663a62ff08 // indirect ++) ++ ++require ( ++ github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect ++ github.com/fatih/color v1.10.0 // indirect ++ github.com/mattn/go-colorable v0.1.8 // indirect ++ github.com/mattn/go-isatty v0.0.12 // indirect ++ github.com/russross/blackfriday/v2 v2.1.0 // indirect ++ github.com/stretchr/testify v1.3.0 // indirect ++ golang.org/x/net v0.8.0 // indirect ++ golang.org/x/sys v0.6.0 // indirect + ) diff --git a/net/librespeed-cli/files/patch-go.sum b/net/librespeed-cli/files/patch-go.sum new file mode 100644 index 000000000000..5eb00e150212 --- /dev/null +++ b/net/librespeed-cli/files/patch-go.sum @@ -0,0 +1,20 @@ +--- go.sum.orig 2023-03-24 21:32:45 UTC ++++ go.sum +@@ -40,6 +40,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go + golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= + golang.org/x/net v0.0.0-20210421230115-4e50805a0758 h1:aEpZnXcAmXkd6AvLb2OPt+EN1Zu/8Ne3pCqPjja5PXY= + golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= ++golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= ++golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +@@ -51,6 +53,8 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go + golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20210421221651-33663a62ff08 h1:qyN5bV+96OX8pL78eXDuz6YlDPzCYgdW74H5yE9BoSU= + golang.org/x/sys v0.0.0-20210421221651-33663a62ff08/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= ++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/net/librespeed-cli/files/patch-vendor_modules.txt b/net/librespeed-cli/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..71131755adff --- /dev/null +++ b/net/librespeed-cli/files/patch-vendor_modules.txt @@ -0,0 +1,59 @@ +--- vendor/modules.txt.orig 2023-03-24 21:34:27 UTC ++++ vendor/modules.txt +@@ -1,43 +1,45 @@ + # github.com/briandowns/spinner v1.12.0 +-## explicit ++## explicit; go 1.14 + github.com/briandowns/spinner + # github.com/cpuguy83/go-md2man/v2 v2.0.0 +-## explicit ++## explicit; go 1.12 + github.com/cpuguy83/go-md2man/v2/md2man + # github.com/fatih/color v1.10.0 +-## explicit ++## explicit; go 1.13 + github.com/fatih/color + # github.com/go-ping/ping v0.0.0-20210407214646-e4e642a95741 +-## explicit ++## explicit; go 1.14 + github.com/go-ping/ping + # github.com/gocarina/gocsv v0.0.0-20210408192840-02d7211d929d +-## explicit ++## explicit; go 1.13 + github.com/gocarina/gocsv + # github.com/mattn/go-colorable v0.1.8 ++## explicit; go 1.13 + github.com/mattn/go-colorable + # github.com/mattn/go-isatty v0.0.12 ++## explicit; go 1.12 + github.com/mattn/go-isatty + # github.com/russross/blackfriday/v2 v2.1.0 + ## explicit + github.com/russross/blackfriday/v2 + # github.com/sirupsen/logrus v1.8.1 +-## explicit ++## explicit; go 1.13 + github.com/sirupsen/logrus + # github.com/stretchr/testify v1.3.0 + ## explicit + # github.com/urfave/cli/v2 v2.3.0 +-## explicit ++## explicit; go 1.11 + github.com/urfave/cli/v2 +-# golang.org/x/net v0.0.0-20210421230115-4e50805a0758 +-## explicit ++# golang.org/x/net v0.8.0 ++## explicit; go 1.17 + golang.org/x/net/bpf + golang.org/x/net/icmp + golang.org/x/net/internal/iana + golang.org/x/net/internal/socket + golang.org/x/net/ipv4 + golang.org/x/net/ipv6 +-# golang.org/x/sys v0.0.0-20210421221651-33663a62ff08 +-## explicit ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/unix + golang.org/x/sys/windows