From nobody Mon Feb 28 12:54:12 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 02D9619F8875; Mon, 28 Feb 2022 12:54:13 +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 4K6gLX65mGz3krS; Mon, 28 Feb 2022 12:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052852; 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=CmK14XbId2wBczFn9H+Z3kHJElwgnuL57TAzk/ezr4A=; b=fJeW26VPZU3M1lwSl6rQWavWg+Q/P+piAJFcycWXxwT2PYZBlqHQ1UfQ2CGEwgkSfeDpMN a/W4rFqonvY1WpLD8pxqG1/jIJhZx07ZHlIQN1rM/tGGf8I9FTHqgD6zI+nqq+d6u3ucRJ mmIYTAoJYdvuJQQft9JcmOM1Omfg9Cl7eKNjxkFsjBd7Cn55WN2zzslRFPJbJ0tdaXXCZC 5mnpIQZq9SKo+AcdI9oX68Hw+L9W9nC/iHByTfhcttyTJI80YqJQayquAnB9vMiU1BYUAg UxCmbCuxGHe+Zwd3Apbxrc0IDaOLHtr1kwvzoniEI7Ehzwr+rp7y8mHH38BizQ== 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 A4A581BE44; Mon, 28 Feb 2022 12:54:12 +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 21SCsCCL067809; Mon, 28 Feb 2022 12:54:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SCsCCd067808; Mon, 28 Feb 2022 12:54:12 GMT (envelope-from git) Date: Mon, 28 Feb 2022 12:54:12 GMT Message-Id: <202202281254.21SCsCCd067808@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: f6fe2ca40866 - main - sysutils/zbackup: 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: f6fe2ca4086687efb4caa53523b977e25b3082a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646052852; 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=CmK14XbId2wBczFn9H+Z3kHJElwgnuL57TAzk/ezr4A=; b=u1BaLaFuVTeM9DE9QY1TQHKbJDjNiLcXitkvotEa7rK0LFyaGVJrGsHitB2dTMHUB+qt5K t+xr+wQo3D+bRP4HDAOKbktRjFx7FW6MTfl6NX679JHX4IreN5EEdi6n4SxcTbJVyUXdN3 W2VJ6GnYzYvsOtw2t8C2kOH/SRkju+OD/R0IGKlJvyLohhhbeDUtUTPOFav5w2369b7I9K DpQqL2xXqhHd70uDQ4+zmTRTcV4WaZoZFjmuTpsVWFZkic2bW66iZVUfNnIslcdk47PNYi ivf1brdLy84nzEtEK6spZ9EW/I9QbhN/sMvl4lZSEfhY2xH6lzwxsb2inlLHCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646052852; a=rsa-sha256; cv=none; b=NMu7gh6kHtObQj8yAqwRiZ2VGKdruFTY7w0axOCNZZoutushXceLfqnG/RRlW8ERaqSthV 9Zb6P32ESONSm6n6Rxut61hrEatDx0bs/syKNeJusp9Hnec1zYDXidXMTyzmj27vZC562m unkX/0OAON1OJaDkijdbS9AEUpTKU3WgssnoxbNTi1zdh4KCPE53pKvUG1oPrNpRCCVe7T GqIZ3ne8zUTfEY2hCYPkvNQu8C6mhDTz9cEhAtruzHZXVtEFTe85F7RH7QUlcc+SQmNBn3 r4+3OYLRJHm4QezJCvrDvm/SCNWe3h/nLGHzzK6Yn2M7oBlETeu2bYq9qNcdzQ== 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=f6fe2ca4086687efb4caa53523b977e25b3082a8 commit f6fe2ca4086687efb4caa53523b977e25b3082a8 Author: Po-Chuan Hsieh AuthorDate: 2022-02-28 09:43:30 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-02-28 12:46:46 +0000 sysutils/zbackup: 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 --- sysutils/zbackup/files/patch-protobuf | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sysutils/zbackup/files/patch-protobuf b/sysutils/zbackup/files/patch-protobuf new file mode 100644 index 000000000000..a16775318d59 --- /dev/null +++ b/sysutils/zbackup/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 + +--- backup_restorer.cc.orig 2015-09-16 07:28:04 UTC ++++ backup_restorer.cc +@@ -27,7 +27,7 @@ void restore( ChunkStorage::Reader & chunkStorageReade + // TODO: this disables size checks for each separate message. Figure a better + // way to do this while keeping them enabled. It seems we need to create an + // instance of CodedInputStream for each message, but it might be expensive +- cis.SetTotalBytesLimit( backupData.size(), -1 ); ++ cis.SetTotalBytesLimit( backupData.size() ); + + // Used when emitting chunks + string chunk;