Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Mar 2024 19:24:50 GMT
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d7663d477698 - main - net-mgmt/pmacct: unbreak with RABBITMQ=on
Message-ID:  <202403291924.42TJOoah003204@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d7663d47769814b8323b148c53316b6c576d6df3

commit d7663d47769814b8323b148c53316b6c576d6df3
Author:     Stewart Morgan <stewart+FreeBSD-BugZilla@arnos-vale.net>
AuthorDate: 2024-03-29 19:22:11 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
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 <amqp.h>
+-#include <amqp_tcp_socket.h>
++#include <rabbitmq-c/amqp.h>
++#include <rabbitmq-c/tcp_socket.h>
++#include <rabbitmq-c/ssl_socket.h>
+ #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 <amqp.h>
+-#include <amqp_tcp_socket.h>
++#include <rabbitmq-c/amqp.h>
++#include <rabbitmq-c/tcp_socket.h>
+ #include <sys/poll.h>
+ 
+ #include "plugin_common.h"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403291924.42TJOoah003204>