Date: Mon, 27 Mar 2023 11:27:22 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f8aa48667ffd - main - irc/soju: fix build on riscv64 Message-ID: <202303271127.32RBRM6o058684@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8aa48667ffd73e0e57f61c942acaa8932ff54c0 commit f8aa48667ffd73e0e57f61c942acaa8932ff54c0 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-03-25 01:52:50 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2023-03-27 11:24:57 +0000 irc/soju: fix build on riscv64 Bump golang.org/x/sys dependency to a version new enough to support riscv64-freebsd. Sponsored by: Berlienr Linux User Group e.V. Approved by: portmgr (build fix blanket) --- irc/soju/Makefile | 8 ++- irc/soju/distinfo | 4 +- irc/soju/files/patch-go.mod | 43 ++++++++++++ irc/soju/files/patch-go.sum | 38 ++++++++++ irc/soju/files/patch-vendor_modules.txt | 119 ++++++++++++++++++++++++++++++++ 5 files changed, 210 insertions(+), 2 deletions(-) diff --git a/irc/soju/Makefile b/irc/soju/Makefile index 592639c5bf41..cf6b67251685 100644 --- a/irc/soju/Makefile +++ b/irc/soju/Makefile @@ -1,7 +1,7 @@ PORTNAME= soju DISTVERSIONPREFIX= v DISTVERSION= 0.5.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= irc MAINTAINER= ashish@FreeBSD.org @@ -12,6 +12,8 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules sqlite:3 +USE_GITHUB= nodefault +GH_TUPLE= golang:sys:v0.6.0:sys OPTIONS_DEFAULT= DOCS OPTIONS_DEFINE= DOCS @@ -28,6 +30,10 @@ PLIST_FILES= bin/soju \ DOCS_BUILD_DEPENDS= scdoc:textproc/scdoc DOCS_PLIST_FILES= man/man1/soju.1.gz \ +pre-patch: + ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys + ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys + post-build-DOCS-on: ${LOCALBASE}/bin/scdoc <${WRKSRC}/doc/${PORTNAME}.1.scd >${WRKSRC}/doc/${PORTNAME}.1 diff --git a/irc/soju/distinfo b/irc/soju/distinfo index 18f2d716cd7b..1ae35e5fd797 100644 --- a/irc/soju/distinfo +++ b/irc/soju/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1662702601 +TIMESTAMP = 1679708642 SHA256 (go/irc_soju/soju-v0.5.2/v0.5.2.mod) = df14df99d21c43fb592a5be28ac8751c8a967b17c53488ad281a00c5b4f3d4bb SIZE (go/irc_soju/soju-v0.5.2/v0.5.2.mod) = 883 SHA256 (go/irc_soju/soju-v0.5.2/v0.5.2.zip) = 4e1a0fb83e42c7a86f6121d51468fc3c9d0ae195a6d785501611ea20e9ad694d SIZE (go/irc_soju/soju-v0.5.2/v0.5.2.zip) = 166549 +SHA256 (go/irc_soju/soju-v0.5.2/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54 +SIZE (go/irc_soju/soju-v0.5.2/golang-sys-v0.6.0_GH0.tar.gz) = 1434234 diff --git a/irc/soju/files/patch-go.mod b/irc/soju/files/patch-go.mod new file mode 100644 index 000000000000..3fb639ac33f3 --- /dev/null +++ b/irc/soju/files/patch-go.mod @@ -0,0 +1,43 @@ +--- go.mod.orig 2023-03-25 01:47:31 UTC ++++ go.mod +@@ -1,23 +1,34 @@ + module git.sr.ht/~emersion/soju + +-go 1.15 ++go 1.17 + + require ( + git.sr.ht/~emersion/go-scfg v0.0.0-20211215104734-c2c7a15d6c99 + git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9 + github.com/SherClockHolmes/webpush-go v1.2.0 + github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac +- github.com/klauspost/compress v1.15.6 // indirect + github.com/lib/pq v1.10.6 + github.com/mattn/go-sqlite3 v1.14.13 + github.com/pires/go-proxyproto v0.6.2 + github.com/prometheus/client_golang v1.12.2 +- github.com/prometheus/common v0.34.0 // indirect + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e +- golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect +- golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect + golang.org/x/time v0.0.0-20220609170525-579cf78fd858 +- google.golang.org/protobuf v1.28.0 // indirect + gopkg.in/irc.v3 v3.1.4 + nhooyr.io/websocket v1.8.7 ++) ++ ++require ( ++ github.com/beorn7/perks v1.0.1 // indirect ++ github.com/cespare/xxhash/v2 v2.1.2 // indirect ++ github.com/golang-jwt/jwt v3.2.2+incompatible // indirect ++ github.com/golang/protobuf v1.5.2 // indirect ++ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect ++ github.com/klauspost/compress v1.15.6 // indirect ++ github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect ++ github.com/prometheus/client_model v0.2.0 // indirect ++ github.com/prometheus/common v0.34.0 // indirect ++ github.com/prometheus/procfs v0.7.3 // indirect ++ golang.org/x/sys v0.6.0 // indirect ++ golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect ++ google.golang.org/protobuf v1.28.0 // indirect + ) diff --git a/irc/soju/files/patch-go.sum b/irc/soju/files/patch-go.sum new file mode 100644 index 000000000000..121c5dc45f55 --- /dev/null +++ b/irc/soju/files/patch-go.sum @@ -0,0 +1,38 @@ +--- go.sum.orig 2023-03-25 01:47:34 UTC ++++ go.sum +@@ -82,7 +82,6 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o + github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= + github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= + github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= + github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= + github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= + github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +@@ -178,10 +177,8 @@ github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0M + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= + github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= + github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= + github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= + github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= + github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +@@ -384,6 +381,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= + golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++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/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= + golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM= +@@ -525,7 +524,6 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L5 + gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= + gopkg.in/irc.v3 v3.1.4 h1:DYGMRFbtseXEh+NadmMUFzMraqyuUj4I3iWYFEzDZPc= diff --git a/irc/soju/files/patch-vendor_modules.txt b/irc/soju/files/patch-vendor_modules.txt new file mode 100644 index 000000000000..d03c655ad319 --- /dev/null +++ b/irc/soju/files/patch-vendor_modules.txt @@ -0,0 +1,119 @@ +--- vendor/modules.txt.orig 2023-03-25 01:48:07 UTC ++++ vendor/modules.txt +@@ -1,80 +1,88 @@ + # git.sr.ht/~emersion/go-scfg v0.0.0-20211215104734-c2c7a15d6c99 +-## explicit ++## explicit; go 1.15 + git.sr.ht/~emersion/go-scfg + # git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9 +-## explicit ++## explicit; go 1.14 + git.sr.ht/~sircmpwn/go-bare + # github.com/SherClockHolmes/webpush-go v1.2.0 +-## explicit ++## explicit; go 1.13 + github.com/SherClockHolmes/webpush-go + # github.com/beorn7/perks v1.0.1 ++## explicit; go 1.11 + github.com/beorn7/perks/quantile + # github.com/cespare/xxhash/v2 v2.1.2 ++## explicit; go 1.11 + github.com/cespare/xxhash/v2 + # github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac +-## explicit ++## explicit; go 1.12 + github.com/emersion/go-sasl + # github.com/golang-jwt/jwt v3.2.2+incompatible ++## explicit + github.com/golang-jwt/jwt + # github.com/golang/protobuf v1.5.2 ++## explicit; go 1.9 + github.com/golang/protobuf/proto + github.com/golang/protobuf/ptypes/timestamp + # github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 ++## explicit; go 1.13 + github.com/google/shlex + # github.com/klauspost/compress v1.15.6 +-## explicit ++## explicit; go 1.16 + github.com/klauspost/compress/flate + # github.com/lib/pq v1.10.6 +-## explicit ++## explicit; go 1.13 + github.com/lib/pq + github.com/lib/pq/oid + github.com/lib/pq/scram + # github.com/mattn/go-sqlite3 v1.14.13 +-## explicit ++## explicit; go 1.12 + github.com/mattn/go-sqlite3 + # github.com/matttproud/golang_protobuf_extensions v1.0.1 ++## explicit + github.com/matttproud/golang_protobuf_extensions/pbutil + # github.com/pires/go-proxyproto v0.6.2 +-## explicit ++## explicit; go 1.13 + github.com/pires/go-proxyproto + # github.com/prometheus/client_golang v1.12.2 +-## explicit ++## explicit; go 1.13 + github.com/prometheus/client_golang/prometheus + github.com/prometheus/client_golang/prometheus/collectors + github.com/prometheus/client_golang/prometheus/internal + github.com/prometheus/client_golang/prometheus/promauto + github.com/prometheus/client_golang/prometheus/promhttp + # github.com/prometheus/client_model v0.2.0 ++## explicit; go 1.9 + github.com/prometheus/client_model/go + # github.com/prometheus/common v0.34.0 +-## explicit ++## explicit; go 1.15 + github.com/prometheus/common/expfmt + github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg + github.com/prometheus/common/model + # github.com/prometheus/procfs v0.7.3 ++## explicit; go 1.13 + github.com/prometheus/procfs + github.com/prometheus/procfs/internal/fs + github.com/prometheus/procfs/internal/util + # golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e +-## explicit ++## explicit; go 1.17 + golang.org/x/crypto/bcrypt + golang.org/x/crypto/blowfish + golang.org/x/crypto/hkdf + golang.org/x/crypto/ssh/terminal +-# golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d +-## explicit ++# golang.org/x/sys v0.6.0 ++## explicit; go 1.17 + golang.org/x/sys/internal/unsafeheader + golang.org/x/sys/plan9 + golang.org/x/sys/unix + golang.org/x/sys/windows + # golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 +-## explicit ++## explicit; go 1.17 + golang.org/x/term + # golang.org/x/time v0.0.0-20220609170525-579cf78fd858 + ## explicit + golang.org/x/time/rate + # google.golang.org/protobuf v1.28.0 +-## explicit ++## explicit; go 1.11 + google.golang.org/protobuf/encoding/prototext + google.golang.org/protobuf/encoding/protowire + google.golang.org/protobuf/internal/descfmt +@@ -104,10 +112,10 @@ google.golang.org/protobuf/runtime/protoimpl + google.golang.org/protobuf/types/descriptorpb + google.golang.org/protobuf/types/known/timestamppb + # gopkg.in/irc.v3 v3.1.4 +-## explicit ++## explicit; go 1.13 + gopkg.in/irc.v3 + # nhooyr.io/websocket v1.8.7 +-## explicit ++## explicit; go 1.13 + nhooyr.io/websocket + nhooyr.io/websocket/internal/bpool + nhooyr.io/websocket/internal/errd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303271127.32RBRM6o058684>