From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0580138334 for ; Tue, 20 Aug 2019 08:30:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7CCEE07FA; Tue, 20 Aug 2019 08:30:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5AEEE07FA for ; Tue, 20 Aug 2019 08:30:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 20610349EF7 for ; Tue, 20 Aug 2019 08:30:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F1776FF for ; Tue, 20 Aug 2019 08:30:14 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1566289812.d7f3d4105fd13bbcf311254a76a36b401ccb6bab.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard2/, net-analyzer/barnyard2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/barnyard2/barnyard2-1.13.ebuild net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch X-VCS-Directories: net-analyzer/barnyard2/ net-analyzer/barnyard2/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d7f3d4105fd13bbcf311254a76a36b401ccb6bab X-VCS-Branch: master Date: Tue, 20 Aug 2019 08:30:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4be5ddd0-1e29-4d6a-83f7-ec5514267a7c X-Archives-Hash: adb9017e68a18a7cd11f4cf1f3cb6f9f commit: d7f3d4105fd13bbcf311254a76a36b401ccb6bab Author: Jeroen Roovers gentoo org> AuthorDate: Tue Aug 20 08:29:21 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Tue Aug 20 08:30:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f3d410 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 gentoo.org> net-analyzer/barnyard2/barnyard2-1.13.ebuild | 1 + net-analyzer/barnyard2/files/barnyard2-1.13-my_bool.patch | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild index 7214129d7ec..64f00cbb8a9 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 00000000000..9cd93220662 --- /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