Date: Mon, 28 Feb 2022 12:54:07 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: dfce603e377b - main - databases/mysql57-server: Fix build with protobuf 3.18.0+ Message-ID: <202202281254.21SCs7JU067706@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfce603e377b20693d6b2fd9169c0d155519659d commit dfce603e377b20693d6b2fd9169c0d155519659d Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-02-28 09:43:07 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> 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<const uint8_t*>(request.buffer()), + static_cast<int>(request.buffer_size())); + // variable 'mysqlx_max_allowed_packet' has been checked when buffer was filling by data +- stream.SetTotalBytesLimit(static_cast<int>(request.buffer_size()), -1 /*no warnings*/); ++ stream.SetTotalBytesLimit(static_cast<int>(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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202281254.21SCs7JU067706>