summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2019-08-20 10:29:21 +0200
committerJeroen Roovers <jer@gentoo.org>2019-08-20 10:30:12 +0200
commitd7f3d4105fd13bbcf311254a76a36b401ccb6bab (patch)
tree019507c8239412352f58031afa3f2e2264e9098e /net-analyzer/barnyard2
parentnet-analyzer/argus-clients: Fix building against dev-db/mysql-connector-c-8* (diff)
downloadgentoo-d7f3d4105fd13bbcf311254a76a36b401ccb6bab.tar.gz
gentoo-d7f3d4105fd13bbcf311254a76a36b401ccb6bab.tar.bz2
gentoo-d7f3d4105fd13bbcf311254a76a36b401ccb6bab.zip
net-analyzer/barnyard2: Fix building against dev-db/mysql-connector-c-8*
Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Diffstat (limited to 'net-analyzer/barnyard2')
-rw-r--r--net-analyzer/barnyard2/barnyard2-1.13.ebuild1
-rw-r--r--net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
index 7214129d7ec1..64f00cbb8a96 100644
--- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild
+++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-2-${PV}"
PATCHES=(
"${FILESDIR}"/${PN}-1.13-free.patch
"${FILESDIR}"/${PN}-1.13-libdir.patch
+ "${FILESDIR}"/${PN}-1.13-my_bool.patch
"${FILESDIR}"/${PN}-1.13-odbc.patch
"${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch
)
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch
new file mode 100644
index 000000000000..9cd93220662e
--- /dev/null
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch
@@ -0,0 +1,11 @@
+--- a/src/output-plugins/spo_database.h
++++ b/src/output-plugins/spo_database.h
+@@ -357,7 +357,7 @@
+ /* Herited from shared data globals */
+
+ unsigned long pThreadID; /* Used to store thread information and know if we "reconnected automaticaly" */
+- my_bool mysql_reconnect; /* We will handle it via the api. */
++ u_int8_t mysql_reconnect; /* We will handle it via the api. */
+ #endif /* ENABLE_MYSQL */
+
+ #ifdef ENABLE_POSTGRESQL