From nobody Fri Mar 29 19:24:50 2024 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 4V5r2V4bMZz5FXKC; Fri, 29 Mar 2024 19:24:50 +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 4V5r2V42K7z43m3; Fri, 29 Mar 2024 19:24:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711740290; 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=Wusb4ugKfba+gYzzrRnxVCqQKuqYhhgN+hD6J2Xk1vY=; b=XgcDaJ/q3boWKftU/EKXY3N6+50bpshOkL1yQQO1Nea1G6Ovp5RlyQavaHKTpTYdoWHnUa cZ32gdoAoJKZJUbRj4W+lvKgyLXmNHer33lS1ZJ1PSSmlmkUGJZKwug4mVyyyPuDFmEo0K it+MwBoahPfcYFrgWWV446DDQwuWCAIwg4nh/F4DrZjuh1X9xRVnXwkONFsbZvH+A5SSZT HDaaAa49nO5r5IUrC4MZZ4Cf4lkl78N9FlTvuEb4c7llHkqluCu3JicHZzHXEPk9srp8kS OvplBmkn5g5iT/Ru56vRlR77kSlCIIgIJUX6snzqBmGvfmpegRFZOA5ha1Ptug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711740290; a=rsa-sha256; cv=none; b=YzDrI8LONWJaGas0qhaMc7WbJHc6xk1+W5YjMIuTVVRrmT+Is6SmrRTIJ3rh11yIBB6m1W r8JEOt4s6HaeR/2w7sFrErTm1u2tqIZMCZB8Bq1zSZYKwcqkpMRUmGz6tnWpWaNOuO97y5 iUpXlvC7vpRo6DRLmDrooUmzVeSiiXOSuZfHJWFUkNU7YRIC4T+EYyRvJO3QYkY/VlZ348 lfKfrtHBkcPkQzPVMLwatQVZnWvmAX+P2fgPam7uPy/G1F+Uky+evkKCfxUzlOzcKKXTL8 S8lK1ZxkYW47i4+FkJCO+kwdQfwXrYJPPtC7m6Rq8CZnhfKjSHia5lxWtP7ITQ== 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=1711740290; 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=Wusb4ugKfba+gYzzrRnxVCqQKuqYhhgN+hD6J2Xk1vY=; b=OkNgpEiU13ntTakvpG1zjVc0Ehwckpb0chJfKpKmdiGrrHfX1vn/7ivAo5EtoumkHxlymx wN9Iy3fabrljhKGg7kVHVxCcvy7l2gEbiai8H7DNdGAptHvCXkth9lb5q7e+4DaxnnTtbb 849Gfm1W+lR5b24BiOqEX/KM5uWj1VST8sCOVzZjbTmRskTIZpu/sGv7wu9+EHYqTgemBG 8IX7ijphEaGCVqRs1dWl3xCRPSwimaEius5ZHIwuXatYcvpn5LuTPgCCFroMYbVEr+wxRE y+VUKY7d8zMn6E+WqqnjMqHGY/XU9e2Hz0BVS1hWVPjEshyDRVXR/Ynjg3sEJA== 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 4V5r2V3dP7zMrh; Fri, 29 Mar 2024 19:24:50 +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 42TJOoF2003207; Fri, 29 Mar 2024 19:24:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42TJOoah003204; Fri, 29 Mar 2024 19:24:50 GMT (envelope-from git) Date: Fri, 29 Mar 2024 19:24:50 GMT Message-Id: <202403291924.42TJOoah003204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: d7663d477698 - main - net-mgmt/pmacct: unbreak with RABBITMQ=on 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: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7663d47769814b8323b148c53316b6c576d6df3 Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7663d47769814b8323b148c53316b6c576d6df3 commit d7663d47769814b8323b148c53316b6c576d6df3 Author: Stewart Morgan AuthorDate: 2024-03-29 19:22:11 +0000 Commit: Kurt Jaeger CommitDate: 2024-03-29 19:24:27 +0000 net-mgmt/pmacct: unbreak with RABBITMQ=on PR: 273598 --- net-mgmt/pmacct/files/patch-src_amqp__common.h | 14 ++++++++++++++ net-mgmt/pmacct/files/patch-src_amqp__plugin.h | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/net-mgmt/pmacct/files/patch-src_amqp__common.h b/net-mgmt/pmacct/files/patch-src_amqp__common.h new file mode 100644 index 000000000000..400f57f6c39b --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src_amqp__common.h @@ -0,0 +1,14 @@ +--- src/amqp_common.h.orig 2022-12-31 20:17:17.000000000 +0100 ++++ src/amqp_common.h 2024-03-29 19:10:46.740680000 +0100 +@@ -23,8 +23,9 @@ + #define AMQP_COMMON_H + + /* includes */ +-#include +-#include ++#include ++#include ++#include + #include "plugin_common.h" + + /* defines */ diff --git a/net-mgmt/pmacct/files/patch-src_amqp__plugin.h b/net-mgmt/pmacct/files/patch-src_amqp__plugin.h new file mode 100644 index 000000000000..b2a1979fbb60 --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src_amqp__plugin.h @@ -0,0 +1,13 @@ +--- src/amqp_plugin.h.orig 2022-12-31 20:17:17.000000000 +0100 ++++ src/amqp_plugin.h 2024-03-29 19:09:18.874002000 +0100 +@@ -22,8 +22,8 @@ + #define AMQP_PLUGIN_COMMON_H + + /* includes */ +-#include +-#include ++#include ++#include + #include + + #include "plugin_common.h"