From nobody Mon Feb 28 12:54:07 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 6333519F8661; Mon, 28 Feb 2022 12:54: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 4K6gLS36pbz3l1T; Mon, 28 Feb 2022 12:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052848; 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=3r7bZgl6ZNrfkE5+JUeTZZuHL2lf2ZMy/SPe6o8cw/c=; b=Rj6o5Sqn9wJrNCfr4+2RG7aAT6yaUBWnxl9+thWBev08WUDH0xrZj72DH4RypmEM4itoRQ zAH1ev3JeBXXyjgr1xi+AJa27RlpYnJ28UPwShhalZ3pP2vaDfU57YR1POAj4JdBo+R8ra DqafbNPGg+bqGnWQlvnasU90E3TPbScIflxBmUEF6ql0uI28Y3mKxPl5ach2hZWOF90+PL 8m8JgYApQ9YRJwcgYrLOYwMixkh0CImv2ceivRzrrrR2KZn9nad+1miLiZVfRZXYyYbil3 8b77Zor8Pd02EjxftK3ByvBzChRiXTwO/9jFVPeuTNBY0CCVyRfg8Xh0KWTpxA== 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 0A0B01BE43; Mon, 28 Feb 2022 12:54:08 +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 21SCs7bo067707; Mon, 28 Feb 2022 12:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCs7JU067706; Mon, 28 Feb 2022 12:54:07 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:54:07 GMT Message-Id: <202202281254.21SCs7JU067706@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: dfce603e377b - main - databases/mysql57-server: Fix build with protobuf 3.18.0+ 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfce603e377b20693d6b2fd9169c0d155519659d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052848; 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=3r7bZgl6ZNrfkE5+JUeTZZuHL2lf2ZMy/SPe6o8cw/c=; b=XDZ9R2sf3V1/BhpJj46rq4w4HZvqkPfolYofMAGTdp8X3Hy7aHB+HNh60t+zFYECvzKa97 Ib+YUkIiEIJuXirdKH1Oyupqzvur5pxss084mQ1Lila1lSSBeBrz/DV0gE4FDHmfbNPeuz ZN03zdCPOp6Cwv8vXL8mY6SQfZX4QnA2E14aNFR125t8wH+R5Jq38jeTn4Omle1KfDAD7s vfjYrV4IjFmx+wLQJjc77jLSdTevSzpqh/RthNhRh3f0J/FCG7+o35nllguAiio2tLfTa8 1UIDdvBCsMFAFe6itHFPX/cF2yBN8adi5TdpB99T/Q5rlJ1JZKi94yqmp867nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052848; a=rsa-sha256; cv=none; b=A4c+hE1uPNfbxN+plYcRzFlBW/+WP+S4dZ18ohzLOWpsEFpICrmHpa50KbggTB+o1Mj7zy NJK+YXfyVALdaZMwgz2catTAzFt9ZMF2XnlOuUvFigEXS5NDiV+t9g7ZLsA5INPAq1Q3XN v9N32cDKWcIlM+Xqq+17cezowg7Fv1oUj9UuTEDpW3hXzZlXudkiQPThvm8jyQsugj7u/v 2Gfw/FZDoLTwAQyP7680nO1hTqdUY0Qmkv5tswbYTxLjuZVB5o4d+GeW1qzVrOdtLGyCxR hQd70w9FfIe3wJScQ8yZiBE6Y7+YDpXgk+8BP1Fz7fVY7+e4v0wCPY/x7RXuQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfce603e377b20693d6b2fd9169c0d155519659d commit dfce603e377b20693d6b2fd9169c0d155519659d Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:43:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:45 +0000 databases/mysql57-server: Fix build with protobuf 3.18.0+ Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0. Reference: https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6 --- databases/mysql57-server/files/patch-protobuf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/databases/mysql57-server/files/patch-protobuf b/databases/mysql57-server/files/patch-protobuf new file mode 100644 index 000000000000..3c1a23fdd859 --- /dev/null +++ b/databases/mysql57-server/files/patch-protobuf @@ -0,0 +1,15 @@ +Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0. + +Reference: https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6 + +--- rapid/plugin/x/ngs/src/protocol_decoder.cc.orig 2021-11-29 20:09:43 UTC ++++ rapid/plugin/x/ngs/src/protocol_decoder.cc +@@ -123,7 +123,7 @@ Error_code Message_decoder::parse(Request &request) + google::protobuf::io::CodedInputStream stream(reinterpret_cast(request.buffer()), + static_cast(request.buffer_size())); + // variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data +- stream.SetTotalBytesLimit(static_cast(request.buffer_size()), -1 /*no warnings*/); ++ stream.SetTotalBytesLimit(static_cast(request.buffer_size())); + // Protobuf limits the number of nested objects when decoding messages + // lets set the value in explicit way (to ensure that is set accordingly with + // out stack size)