| 1 |
commit: d7f3d4105fd13bbcf311254a76a36b401ccb6bab |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 20 08:29:21 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 20 08:30:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f3d410 |
| 7 |
|
| 8 |
net-analyzer/barnyard2: Fix building against dev-db/mysql-connector-c-8* |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
net-analyzer/barnyard2/barnyard2-1.13.ebuild | 1 + |
| 14 |
net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch | 11 +++++++++++ |
| 15 |
2 files changed, 12 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild |
| 18 |
index 7214129d7ec..64f00cbb8a9 100644 |
| 19 |
--- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild |
| 20 |
+++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild |
| 21 |
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-2-${PV}" |
| 22 |
PATCHES=( |
| 23 |
"${FILESDIR}"/${PN}-1.13-free.patch |
| 24 |
"${FILESDIR}"/${PN}-1.13-libdir.patch |
| 25 |
+ "${FILESDIR}"/${PN}-1.13-my_bool.patch |
| 26 |
"${FILESDIR}"/${PN}-1.13-odbc.patch |
| 27 |
"${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch |
| 28 |
) |
| 29 |
|
| 30 |
diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..9cd93220662 |
| 33 |
--- /dev/null |
| 34 |
+++ b/net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch |
| 35 |
@@ -0,0 +1,11 @@ |
| 36 |
+--- a/src/output-plugins/spo_database.h |
| 37 |
++++ b/src/output-plugins/spo_database.h |
| 38 |
+@@ -357,7 +357,7 @@ |
| 39 |
+ /* Herited from shared data globals */ |
| 40 |
+ |
| 41 |
+ unsigned long pThreadID; /* Used to store thread information and know if we "reconnected automaticaly" */ |
| 42 |
+- my_bool mysql_reconnect; /* We will handle it via the api. */ |
| 43 |
++ u_int8_t mysql_reconnect; /* We will handle it via the api. */ |
| 44 |
+ #endif /* ENABLE_MYSQL */ |
| 45 |
+ |
| 46 |
+ #ifdef ENABLE_POSTGRESQL |
Archives