Date: Wed, 2 Feb 2022 22:13:09 GMT From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 17637ebbd4f0 - main - net-im/dendrite: Unbreak on 32-bit platforms Message-ID: <202202022213.212MD9YK026985@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=17637ebbd4f09a7b9b25607e10d637aaf765aa62 commit 17637ebbd4f09a7b9b25607e10d637aaf765aa62 Author: Ashish SHUKLA <ashish@FreeBSD.org> AuthorDate: 2022-02-02 21:36:54 +0000 Commit: Ashish SHUKLA <ashish@FreeBSD.org> CommitDate: 2022-02-02 22:12:55 +0000 net-im/dendrite: Unbreak on 32-bit platforms - Import a patch from upstream of a dependency[0] to unbreak on 32-bit platforms [0] https://github.com/Shopify/sarama/commit/a51d20aa5788d0930d43013e03d735a6869ad7c9 Reported by: pkg-fallout --- net-im/dendrite/Makefile | 1 + ...tch-vendor_github.com_Shopify_sarama_gssapi__kerberos.go | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/net-im/dendrite/Makefile b/net-im/dendrite/Makefile index 905764560ddb..e5ea1e84f612 100644 --- a/net-im/dendrite/Makefile +++ b/net-im/dendrite/Makefile @@ -1,6 +1,7 @@ PORTNAME= dendrite DISTVERSIONPREFIX= v DISTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= ashish@FreeBSD.org diff --git a/net-im/dendrite/files/patch-vendor_github.com_Shopify_sarama_gssapi__kerberos.go b/net-im/dendrite/files/patch-vendor_github.com_Shopify_sarama_gssapi__kerberos.go new file mode 100644 index 000000000000..b94d961296f0 --- /dev/null +++ b/net-im/dendrite/files/patch-vendor_github.com_Shopify_sarama_gssapi__kerberos.go @@ -0,0 +1,13 @@ +--- vendor/github.com/Shopify/sarama/gssapi_kerberos.go.orig 2021-05-07 12:35:44 UTC ++++ vendor/github.com/Shopify/sarama/gssapi_kerberos.go +@@ -59,8 +59,8 @@ type KerberosClient interface { + func (krbAuth *GSSAPIKerberosAuth) writePackage(broker *Broker, payload []byte) (int, error) { + length := len(payload) + size := length + 4 // 4 byte length header + payload +- if size > math.MaxUint32 { +- return 0, errors.New("payload too large, will overflow uint32") ++ if size > math.MaxInt32 { ++ return 0, errors.New("payload too large, will overflow int32") + } + finalPackage := make([]byte, size) + copy(finalPackage[4:], payload)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202022213.212MD9YK026985>