From nobody Wed Feb 02 22:13:09 2022 X-Original-To: dev-commits-ports-main@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 69F9B19AA1BB; Wed, 2 Feb 2022 22:13:09 +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 4JpwzT2Yq7z573t; Wed, 2 Feb 2022 22:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643839989; 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=GoXhy8M1Df2Vaj+X6gddQAzKAhQCl6S/6V2H4ke/nWU=; b=pEudUnc3GWuySMIBPsID5PdA0dh1usGAtz99kReR0O/YK5+HyVgLKuPLfLV1SDsgx3gJ1I WU5TFmaLswFpTZY0L/J3BzYrm7kEQ1stu0hxArG1ZOmvBAXna3dnxCDAW+AoXhdDX7NHdb NpbYlFzXQOgLRIUEqtNn1dpucicWbXwcmOFxeyz0I9g22mXF9jcreOqm5vb2w75ToV7qoV /o82pBjOilfSf7kJGBWVz5ZFW6G5LNjCQC8jZKwthHUUQDooFJi6HR1XgNUZhl4SoT29KA d7oNhixp7Wq51Bvyll9bhb7pXrEIooiSR06vVo8gBrn8a37zLIhvK3BHB0jI1w== 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 37E6C45BF; Wed, 2 Feb 2022 22:13: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 212MD9e8026986; Wed, 2 Feb 2022 22:13:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212MD9YK026985; Wed, 2 Feb 2022 22:13:09 GMT (envelope-from git) Date: Wed, 2 Feb 2022 22:13:09 GMT Message-Id: <202202022213.212MD9YK026985@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 17637ebbd4f0 - main - net-im/dendrite: Unbreak on 32-bit platforms List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17637ebbd4f09a7b9b25607e10d637aaf765aa62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643839989; 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=GoXhy8M1Df2Vaj+X6gddQAzKAhQCl6S/6V2H4ke/nWU=; b=U6G1jQgI5k356LIN2dG4e1MsdEEXFEDSLMKtdIWqdt15a6dEkWZBAruFJwP7BJpAk/Ztb+ ME0s9clIhIanNR/VIa6NJMwsoo0ettLHX5hnAxML/uLR5HM373XLtI2JN0UZ+11RZkP8ZS bLD5ilVutpiHDLZYL4VqoFCUH7um8yYCk9zsmWQsmZcLctmAflCMCsk/TJ2GWuqz6Eltc7 4qo13Ac0G9eAHiUmr4ZW7OCJUyY76zCqGRFco5xjVoASK/Tc1QtBKnauzFQ+fCEwq/pBiC 7y2IcP4sG2mWWWjf980DZfw3qMha/YsTUAeCUAlFwwug7d5/3MqUNCH8rF8wGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643839989; a=rsa-sha256; cv=none; b=nQC0TW4Vrc+9qVJGpmakBcMyRe1nN27xG8zZFKgadZQMveRfNOpSmilCe15flcLDkIGF17 vHpwmYTNxMx1W1iOUmmC4FQ1PBZY6IXBKQAfDaelwg09xlZEoJvTpBRYDziJ63TrHt5JbQ 75ZKxAwG1+Qn3w7SJlpcFu4z2lRY00nmFLIuO4PXkfEYcKbIqnl/nevg+VWHYnmJJMbLwo F8oSno0wrOl48U2ijVEZlnXHE0NaEmEOq3vB8cy5bR/rjCA0ojM7BkOT8PWSqQ28od2+j7 xE/GPjjNM4/+G/wTsgVNNcn6weXDnKmExX6pWINmYh5gyr8USeXsB44UCUa8aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=17637ebbd4f09a7b9b25607e10d637aaf765aa62 commit 17637ebbd4f09a7b9b25607e10d637aaf765aa62 Author: Ashish SHUKLA AuthorDate: 2022-02-02 21:36:54 +0000 Commit: Ashish SHUKLA 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)