From nobody Thu Aug 15 11:56:15 2024 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 4Wl3Vm301Kz5TVbW; Thu, 15 Aug 2024 11:56:16 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl3Vl58x1z4329; Thu, 15 Aug 2024 11:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723722975; 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=GVdP3ZXmjIXVL5b14Pb6NZG6pYJHZd4J/fjtz3DCtkc=; b=JOGSYIkuwFRejSWarI/qhZCM58DNgE5OYIhpv3kjqV+DO/TzbKjMWBXNSq7IaMoen0/1SC EytMNMWfK+vX4iB2wVSxcviFxdm9+ZoB3vb9C30yjOetwrUW2y7MD06FvPJj/PsMW+FWRq fYnwDx0hIj/o3nuGvqCZNQ0Ox+rWLekF7o09RO6ubk5V4u46e/4dVKdqx/3TqQGzgIJQ5c CdmRyiirdFzuDF1DPa7N54lJfIEgjbj7Y73mS8alVNWSTbswR1+Mz2tvFtHH5sDOnBAn+l QXQY3rDwkbVq6mT28r+xKapAOWtZKCMg12UDQmdvVrbXQBtOYjSPH2KWBjZaAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723722975; a=rsa-sha256; cv=none; b=HX6GPRKkmbL2D8VGn/XkSxk6HC4mGrFksSQz7rgKaV7d9FTUMc9vEtt28LwsRfuQipwzC6 FjNteNRtHoKBdNIc3vxxB7FUS4Vnvj/mhwgz5ZvRdZp2sPAnD/JyK25VOosLYbpvNEDbO0 NTJSrmUkvKKc0EzKC+COI80tt+E3AmoH8Tj9lMPo2nhZTDBVPZr7fROy5Fj3PfFd8HwrgR 4b1VT3xutEDAZU9JY838Uyg6uBDYZuLVDc/IiDAbLaNPZ8iXRdMfbUNguRGFwS0bxAUBDr Niw7SYLHUY2Rne6IOpAnUiM0igvnlKmMXHKew8U6d65Oct/8n+oe/Y5ltuv5zg== 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=1723722975; 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=GVdP3ZXmjIXVL5b14Pb6NZG6pYJHZd4J/fjtz3DCtkc=; b=XZ7vEQMS3cAr3+eRmnycTMY5qzUHOAO5NARztLQVMbSCP7j5/XhZwMHi5QKnFOfczdmdC8 holm7bx6H2d0JIRP8yd+3R8ZRCH8CkVgbQ64PR5aJ9OnfK7ARQYyyDGkKd1lSAc+ZLFulB nWNiuSVCmb7VyhVoHxIMgu1pzHFFurCXTCnjBrOQGhv8zd4uTFIqsl76gbusCM+wa2UixT oUBm9ZlVQ6Nlw5dcneVbdyKRwjZs76lteUmOoB7n4J/HazFGZ1wUo81NV4qUBh1lcuvGcH oJJYlf+DxSpGAbU3GXcSWIzHSDQ1LEMO2PxrAazLfHXUxulgf2fx+G0mhRXriw== 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 4Wl3Vl4kJczMBr; Thu, 15 Aug 2024 11:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FBuFjl060544; Thu, 15 Aug 2024 11:56:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FBuFoY060541; Thu, 15 Aug 2024 11:56:15 GMT (envelope-from git) Date: Thu, 15 Aug 2024 11:56:15 GMT Message-Id: <202408151156.47FBuFoY060541@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: 524fa2c149b3 - main - devel/bear: Fix buld with protobuf 26.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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 524fa2c149b3fea04f1787b45f7ea92ec096c433 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=524fa2c149b3fea04f1787b45f7ea92ec096c433 commit 524fa2c149b3fea04f1787b45f7ea92ec096c433 Author: Po-Chuan Hsieh AuthorDate: 2024-08-15 11:46:00 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-08-15 11:47:41 +0000 devel/bear: Fix buld with protobuf 26.0+ Obtained from: https://github.com/rizsotto/Bear/commit/3ba056a6cdebd1608279e89b021e7c28bcee3ea3 --- devel/bear/files/patch-protobuf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/devel/bear/files/patch-protobuf b/devel/bear/files/patch-protobuf new file mode 100644 index 000000000000..4f7ea7ae961b --- /dev/null +++ b/devel/bear/files/patch-protobuf @@ -0,0 +1,24 @@ +Obtained from: https://github.com/rizsotto/Bear/commit/3ba056a6cdebd1608279e89b021e7c28bcee3ea3 + +--- source/intercept/source/collect/db/EventsDatabaseWriter.cc.orig 2023-08-28 08:46:17 UTC ++++ source/intercept/source/collect/db/EventsDatabaseWriter.cc +@@ -21,6 +21,8 @@ + #include "libsys/Errors.h" + + #include ++#include ++ + #include + + #include +@@ -36,7 +38,9 @@ namespace { + JsonPrintOptions create_print_options() { + JsonPrintOptions print_options; + print_options.add_whitespace = false; +- print_options.always_print_primitive_fields = true; ++#if GOOGLE_PROTOBUF_VERSION < 5026000 ++ print_options.always_print_primitive_fields = true; ++#endif + print_options.preserve_proto_field_names = true; + print_options.always_print_enums_as_ints = false; + return print_options;