commit: 37f1aed97d3aa07129af7d3edd9acac50b342992 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Tue Aug 20 08:15:41 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Tue Aug 20 08:19:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f1aed9
net-analyzer/argus-clients: Fix building against dev-db/mysql-connector-c-8* Package-Manager: Portage-2.3.72, Repoman-2.3.17 Bug: https://bugs.gentoo.org/665932 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../argus-clients/argus-clients-3.0.8.2-r3.ebuild | 75 ++++++++++++++++++++++ .../files/argus-clients-3.0.8.2-my_bool.patch | 42 ++++++++++++ 2 files changed, 117 insertions(+) diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild new file mode 100644 index 00000000000..637ef50ad05 --- /dev/null +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools toolchain-funcs + +DESCRIPTION="Clients for net-analyzer/argus" +HOMEPAGE="https://www.qosient.com/argus/"; +SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz"; + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug ft geoip mysql sasl tcpd" + +ARGUS_CDEPEND=" + net-analyzer/rrdtool[perl] + net-libs/libpcap + net-libs/libtirpc:= + sys-libs/ncurses:= + sys-libs/readline:= + sys-libs/zlib + ft? ( net-analyzer/flow-tools ) + geoip? ( dev-libs/geoip ) + mysql? ( dev-db/mysql-connector-c:0= ) + sasl? ( dev-libs/cyrus-sasl ) +" +RDEPEND=" + ${ARGUS_CDEPEND} +" +DEPEND=" + ${ARGUS_CDEPEND} + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-ar.patch + "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch + "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch + "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + tc-export AR RANLIB + + use debug && touch .debug + econf \ + $(use_with ft libft) \ + $(use_with geoip GeoIP /usr/) \ + $(use_with sasl) \ + $(use_with tcpd wrappers) \ + $(use_with mysql mysql /usr) +} + +src_compile() { + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + RANLIB=$(tc-getRANLIB) \ + CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" +} + +src_install() { + dobin bin/ra* + dodoc ChangeLog CREDITS README CHANGES + doman man/man{1,5}/* +} diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch new file mode 100644 index 00000000000..99cd6b255ae --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-my_bool.patch @@ -0,0 +1,42 @@ +--- a/examples/ramysql/rasql.c ++++ b/examples/ramysql/rasql.c +@@ -414,7 +414,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL; + char *sptr = NULL, *ptr; + MYSQL_RES *mysqlRes; +--- a/examples/ramysql/rasqlinsert.c ++++ b/examples/ramysql/rasqlinsert.c +@@ -7026,7 +7026,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + char *sptr = NULL, *ptr; + char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL; + MYSQL_RES *mysqlRes; +--- a/examples/ramysql/rasqltimeindex.c ++++ b/examples/ramysql/rasqltimeindex.c +@@ -539,7 +539,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + char *sptr = NULL, *ptr; + char userbuf[1024], sbuf[1024], db[1024], *dbptr = NULL; + MYSQL_RES *mysqlRes; +@@ -797,7 +797,7 @@ + void + RaMySQLInit () + { +- my_bool reconnectbuf = 1, *reconnect = &reconnectbuf; ++ int reconnectbuf = 1, *reconnect = &reconnectbuf; + unsigned int RaTableFlags = 0; + int retn = 0, x; + char *sptr = NULL, *ptr;
