From nobody Sat Apr 16 04:25:05 2022 X-Original-To: dev-commits-ports-all@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 C09227CE8F0; Sat, 16 Apr 2022 04:25:08 +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 4KgKqR2w3Tz3Nwt; Sat, 16 Apr 2022 04:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083108; 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=2KJ6SLc6tHN2qUYCY2t6Mj92BMcGRylv8dzDyjgnwdo=; b=TiRMay8udB95AG8sZEwmz/umJRivK2vlEqwQm1a3Bm+99gVb0Rk5pQ9eP6sPaHICXlPI7j k2yoM0lFXCXJ11PobnyHXp8oLZnAQDDjkwPfxX3yuk4je1vJlr7XkM018kFtzrbGpfZzBf VL5W7sX2sGpXB2BWl3YyVP9GZImrJV/LFRruboQeDG+IvksrPiCbEqeJgC1a+m5u9WDqgH DXsNusYVxhk332/NncyNFgUiKXh8MJJn3Sl2zOM5+5UsAjhb+ZIkA7pOssrELWNehV+L9c 50rwDV5jhXBvUT9HcSLy3o3d0qYOjBxEdTywWhh3b4PzxLgBVbFjc+FusOy18w== 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 D46D322FA1; Sat, 16 Apr 2022 04:25:05 +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 23G4P51e008316; Sat, 16 Apr 2022 04:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G4P54j008315; Sat, 16 Apr 2022 04:25:05 GMT (envelope-from git) Date: Sat, 16 Apr 2022 04:25:05 GMT Message-Id: <202204160425.23G4P54j008315@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: 76e3cae42986 - main - databases/mysql57-server: Fix build with protobuf 3.20.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 76e3cae429868de40817b2d5b9efa7aac2973be3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083108; 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=2KJ6SLc6tHN2qUYCY2t6Mj92BMcGRylv8dzDyjgnwdo=; b=Q1XTsdEY/AQRj8MkjtIA1d10tPR6Ydx7ycrYsseM/jbVNMvgvIsRBQg9XX/1vj8bGQa1wo xxjZK6OrTXuyoew3o4W4441W0tSWvkq3RutjHqZ6aXlNkS6tJlYBb5JP5IXojpGEbdJhxD wZzjNT09Xh7KCptRI5HmqSBVLhW/1uqKxbZk3oz0EqE6dm9GQvZyCsJ5Yc8ChJit1bg+YF 5jGkvZSPlOYz1LNUg9bHjx3uTpL3wK3DK7oO0rXJiohepDOVSUC894cgQ1HK287/veJMSd 0RkiUuP1uEXo4+UUAo+6HI/P6BwsdFHtR41D5ZWMa2ITH2G0XDpS9IVjJSyHUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650083108; a=rsa-sha256; cv=none; b=pP2O33+myIwBluws09ac6bYuWZmYUa/LnLtdY2m6aORKsemaXmeqKvLhqJ19RDjgSRY6dH DVk81Lj1sJi98Qy8CAAKlYvYn8vvUiw0jgtO5oyFIfrLnqOdfLAuapY8PHIR0Fut7R7iC3 5F+4zSltqVOTRRmpo3Dborlrw5/zsfD1C2jONiSymTE/rlXQE8/S5sFh7vVdLkzDmJ2+sv tC/fCHSDmBWa7VVdM1R+uwHZVVaJvgV+/fjOC31flrtHaqQ25qgqXTBNBJCkE8X2aPJVtz HPkktXYo1JBCMkbTH/wqxujRPwd95sU5pGbhRVs5lE5li9SSAzW6nbwCUEWiyQ== 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=76e3cae429868de40817b2d5b9efa7aac2973be3 commit 76e3cae429868de40817b2d5b9efa7aac2973be3 Author: Po-Chuan Hsieh AuthorDate: 2022-04-16 04:14:52 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-16 04:19:49 +0000 databases/mysql57-server: Fix build with protobuf 3.20.0+ --- databases/mysql57-server/files/patch-protobuf | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/databases/mysql57-server/files/patch-protobuf b/databases/mysql57-server/files/patch-protobuf index 3c1a23fdd859..4326fdb49df2 100644 --- a/databases/mysql57-server/files/patch-protobuf +++ b/databases/mysql57-server/files/patch-protobuf @@ -2,6 +2,23 @@ Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0 Reference: https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6 +--- rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc.orig 2021-11-29 20:09:43 UTC ++++ rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc +@@ -629,12 +629,12 @@ class ErrorDumper : public ::google::protobuf::io::Err + std::stringstream m_out; + + public: +- virtual void AddError(int line, int column, const string & message) ++ virtual void AddError(int line, int column, const std::string & message) + { + m_out << "ERROR in message: line " << line+1 << ": column " << column << ": " << message<<"\n"; + } + +- virtual void AddWarning(int line, int column, const string & message) ++ virtual void AddWarning(int line, int column, const std::string & message) + { + m_out << "WARNING in message: line " << line+1 << ": column " << column << ": " << message<<"\n"; + } --- 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)