From nobody Thu Dec 14 17:03:23 2023 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 4SrdwC57t7z52krK; Thu, 14 Dec 2023 17:03:23 +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 4SrdwC3VFNz3Yk1; Thu, 14 Dec 2023 17:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573403; 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=oWCF88CrRLL58qIjCl8TULDt6KGh2XN2oxO2SuCAM7A=; b=D3Y1wXZi/C/af69CC+z78KmbOMujs2rNRhxNCJVTV/Cvv8wJ3QuG3UQ+7bI8MrucT6SsGg JQ9Sf4xtVAxtbDqQuZVTc1DYoIzSWZrryIpDPjvrlkTrwv4C/bRVyi/Uotuix4M0Mu1sg4 cI73Z+JyLmCrbM8lQVpvB3kFeqpsVgBxFr3x7tC6gUt8QpSqx0VO3uY1zoXzPUWo+BdNgG hMpuLlRdmZvK11lUKTBbr50MKQC7XLtrbaUAMnNEkiquWxrtXwEqWEg5f424hWNpNErX7v fi3L7xFWCtJYe+QR3Kt6MgxEJaetRo5+nakTTNu9st3y/e+ScXfv2es0C8gGAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702573403; a=rsa-sha256; cv=none; b=GuFNfjcTpUukIr0b+qP+3e0DjHjeG6ojD10mlIcn424qRbTw/3JuXBeqwqjY7vJr0GOVfs OrrMbZAzJ8J4G/Dalt+3uwyCxCOK/jUftck8/F/m2UdGlnFsAmh1gq4ztot2xQGNzLk+YB vRCNtP9MTO02KN3JkZuGoW6BvCbTK6i1ArndBOxJObzIOH4n17179V4w/85XecZm8gNjF0 qjixqYPuqzWb5lvveaZUygbTIclBCKiN5WLiiDzN3ATYqUsPqlsUR4zCcGoy/1P/cZSMbF HLgkleQilmHfglPc84eSoKIqf9FOIJrXvxnaXR19o7sN8ai8gphV2LrrErU+lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702573403; 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=oWCF88CrRLL58qIjCl8TULDt6KGh2XN2oxO2SuCAM7A=; b=o+3qQSMo+ADMnN0CoPU5KGfbC3+lbvHqm8+PAaGXLjwZvPNa9MTADf5lY66n8hV/wtLBra HbtwF3p8KQdppHk3hmByiX93dP3tCtfSLSMxTz5shuqaWRRQE7Uvl8F4t6a4ih9x9FIgmS uRT8o9WIF3fIBGOCEvrGNC6ceUkXL9pKJoto6j+ZUQdnjFsy3s9xOlHeUW/cn0QzhlF3a1 FCX2zJz/ZJRJbK5eDY7rypJE13eCehpqpGtWUawXIckHbquF4E4BX5fjmmcy6aJeVSSti2 g6faO6M9mka7rkxJjB+pVNvHWTjFCK7gKj0mIKzN+xx/xxNbvHztPHGW7scqcA== 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 4SrdwC2c8mzZyy; Thu, 14 Dec 2023 17:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEH3NHb016509; Thu, 14 Dec 2023 17:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEH3NQj016506; Thu, 14 Dec 2023 17:03:23 GMT (envelope-from git) Date: Thu, 14 Dec 2023 17:03:23 GMT Message-Id: <202312141703.3BEH3NQj016506@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: 6e980054b5f3 - main - databases/mysql57-{client,server}: Use bundled protobuf 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: 6e980054b5f371e5d5512613fa79445863e90f68 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e980054b5f371e5d5512613fa79445863e90f68 commit 6e980054b5f371e5d5512613fa79445863e90f68 Author: Po-Chuan Hsieh AuthorDate: 2023-12-14 16:22:25 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-14 17:03:03 +0000 databases/mysql57-{client,server}: Use bundled protobuf - Bump PORTREVISION for dependency and package change mysql57 failed to build with protobuf 22+. Since the maintainer already committed a fix [1] on mysql80 to use bundled protobuf, we take the same approach to avoid build error with protobuf 22+ from ports tree and potential issue. PR: 270289 Reference: https://cgit.freebsd.org/ports/commit/?id=567557abbfc0a4deec492983ffc01da78c62bae4 [1] --- databases/mysql57-client/Makefile | 2 +- databases/mysql57-server/Makefile | 8 +++---- databases/mysql57-server/files/patch-protobuf | 32 --------------------------- 3 files changed, 5 insertions(+), 37 deletions(-) diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index 1d0f056d736c..3fbe5dcb7a63 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -1,5 +1,5 @@ PORTNAME= mysql -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 12692e94682e..0aae5a5ded25 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mysql PORTVERSION= 5.7.44 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server @@ -30,8 +30,7 @@ MY_TMPDIR= /var/db/mysql_tmpdir LIB_DEPENDS+= libcurl.so:ftp/curl \ libevent.so:devel/libevent \ - liblz4.so:archivers/liblz4 \ - libprotobuf.so:devel/protobuf + liblz4.so:archivers/liblz4 CMAKE_BUILD_TYPE= Release @@ -43,6 +42,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="${INFO_PATH}" \ -DINSTALL_LIBDIR="lib/mysql" \ + -DINSTALL_PRIV_LIBDIR="lib/mysql/private" \ -DINSTALL_MANDIR="share/man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ @@ -60,7 +60,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ - -DWITH_PROTOBUF=system \ + -DWITH_PROTOBUF=bundled \ -DWITH_CURL=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_DEBUG=0 diff --git a/databases/mysql57-server/files/patch-protobuf b/databases/mysql57-server/files/patch-protobuf deleted file mode 100644 index 4326fdb49df2..000000000000 --- a/databases/mysql57-server/files/patch-protobuf +++ /dev/null @@ -1,32 +0,0 @@ -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) - 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)