* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/argus-clients/, net-analyzer/argus-clients/files/
@ 2019-02-17 12:54 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-02-17 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 9869c57802fc123b8e785992106ea54fb65512bf
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 12:53:34 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 12:54:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9869c578
net-analyzer/argus-clients: Fix USE=mysql
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Fixes: https://bugs.gentoo.org/678214
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../argus-clients/argus-clients-3.0.8.2-r2.ebuild | 1 +
.../argus-clients-3.0.8.2-curses-readline.patch | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
index 34882be08c0..42799057487 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
@@ -39,6 +39,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
"${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
"${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+ "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch
)
src_prepare() {
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch
new file mode 100644
index 00000000000..fc8d3d0ed6e
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-curses-readline.patch
@@ -0,0 +1,21 @@
+--- a/examples/ramysql/Makefile.in
++++ b/examples/ramysql/Makefile.in
+@@ -56,7 +56,8 @@
+
+
+ MYSQLLIB = @MYSQL_LDFLAGS@
+-CURSESLIB = @CURSESLIB@ @V_READLINE@
++CURSESLIB = @CURSESLIB@
++V_READLINE = @V_READLINE@
+
+
+ # Standard CFLAGS
+@@ -94,7 +95,7 @@
+ $(CC) $(CCOPT) -o $@ rasql.o $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)
+
+ $(INSTALLBIN)/rasqlinsert: rasqlinsert.o raclient.o $(LIB)
+- $(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB)
++ $(CC) $(CCOPT) -o $@ raclient.o rasqlinsert.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB) $(CURSESLIB) $(V_READLINE)
+
+ $(INSTALLBIN)/rasqltimeindex: rasqltimeindex.o $(LIB)
+ $(CC) $(CCOPT) -o $@ rasqltimeindex.o @V_PCRE@ $(LDFLAGS) $(MYSQLLIB) $(LIB) $(COMPATLIB)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/argus-clients/, net-analyzer/argus-clients/files/
@ 2019-08-20 8:19 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-08-20 8:19 UTC (permalink / raw
To: gentoo-commits
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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/argus-clients/, net-analyzer/argus-clients/files/
@ 2021-03-15 21:39 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-15 21:39 UTC (permalink / raw
To: gentoo-commits
commit: ac02f7d0ecc503595ae5f43654aea1376ff85a06
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:33:29 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:38:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac02f7d0
net-analyzer/argus-clients: drop 3.0.8, 3.0.8.2, 3.0.8.2-r2, 3.0.8.2-r3
Bug: https://bugs.gentoo.org/776508
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/argus-clients/Manifest | 2 -
.../argus-clients/argus-clients-3.0.8.2-r2.ebuild | 74 ---------------------
.../argus-clients/argus-clients-3.0.8.2-r3.ebuild | 75 ----------------------
.../argus-clients/argus-clients-3.0.8.2.ebuild | 72 ---------------------
.../argus-clients/argus-clients-3.0.8.ebuild | 72 ---------------------
.../files/argus-clients-3.0.8.2-rpc.patch | 34 ----------
6 files changed, 329 deletions(-)
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 86af1c6d491..e93bb4e9c8d 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1,3 +1 @@
-DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855
DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
-DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
deleted file mode 100644
index d87060d87be..00000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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-rpc.patch
- "${FILESDIR}"/${PN}-3.0.8.2-ar.patch
- "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.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/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
deleted file mode 100644
index 637ef50ad05..00000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
deleted file mode 100644
index d16c7f6422a..00000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils 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"
-
-MY_CDEPEND="
- net-analyzer/rrdtool[perl]
- net-libs/libpcap
- sys-libs/ncurses:=
- sys-libs/readline:=
- sys-libs/zlib
- ft? ( net-analyzer/flow-tools )
- geoip? ( dev-libs/geoip )
- mysql? ( virtual/mysql )
- sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
- ${MY_CDEPEND}
-"
-
-DEPEND="
- ${MY_CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
- "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
- sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
- tc-export AR RANLIB
-
- eautoreconf
-}
-
-src_configure() {
- use debug && touch .debug
- econf \
- $(use_with ft libft) \
- $(use_with geoip GeoIP /usr/) \
- $(use_with sasl) \
- $(use_with tcpd wrappers) \
- $(use_with mysql)
-}
-
-src_compile() {
- # racurses uses both libncurses and libtinfo, if present
- 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/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
deleted file mode 100644
index 742c6cbebee..00000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils 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"
-
-MY_CDEPEND="
- net-analyzer/rrdtool[perl]
- net-libs/libpcap
- sys-libs/ncurses
- sys-libs/readline
- sys-libs/zlib
- ft? ( net-analyzer/flow-tools )
- geoip? ( dev-libs/geoip )
- mysql? ( virtual/mysql )
- sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
- ${MY_CDEPEND}
-"
-
-DEPEND="
- ${MY_CDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
- "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
- sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
- tc-export AR RANLIB
-
- eautoreconf
-}
-
-src_configure() {
- use debug && touch .debug
- econf \
- $(use_with ft libft) \
- $(use_with geoip GeoIP /usr/) \
- $(use_with sasl) \
- $(use_with tcpd wrappers) \
- $(use_with mysql)
-}
-
-src_compile() {
- # racurses uses both libncurses and libtinfo, if present
- 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-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
deleted file mode 100644
index e140fa96b2a..00000000000
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,6 +40,7 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- AC_PROG_YACC
-+PKG_PROG_PKG_CONFIG
-
- AC_CHECK_PROGS(V_RANLIB, ranlib, @true)
- AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_)
-@@ -82,6 +83,12 @@
- AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h])
- AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h])
-
-+PKG_CHECK_MODULES(libtirpc, libtirpc,
-+ [LIBS="${LIBS} ${libtirpc_LIBS}"],
-+[AC_CHECK_HEADER([rpc/types.h],,
-+ [AC_MSG_ERROR([Cannot find <rpc/types.h>])])]
-+)
-+
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_INLINE
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -48,7 +48,7 @@
-
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@
-+INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@
- DEFS = @DEFS@ -DARGUS_SYSLOG
-
- # Standard CFLAGS
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/argus-clients/, net-analyzer/argus-clients/files/
@ 2022-12-01 4:23 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-01 4:23 UTC (permalink / raw
To: gentoo-commits
commit: fdd843377392e2b0d1a7542d10bc194604a77247
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 04:21:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 04:21:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd84337
net-analyzer/argus-clients: add 3.0.8.4
Closes: https://bugs.gentoo.org/808861
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/argus-clients/Manifest | 1 +
.../argus-clients/argus-clients-3.0.8.4.ebuild | 76 ++++++++++++++++++++++
.../argus-clients-3.0.8.3-configure-clang16.patch | 41 ++++++++++++
.../argus-clients-3.0.8.4-autoconf-2.70.patch | 55 ++++++++++++++++
4 files changed, 173 insertions(+)
diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index e93bb4e9c8d8..bec9030f51dc 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -1 +1,2 @@
DIST argus-clients-3.0.8.3.tar.gz 2753929 BLAKE2B 561b945ce5beb8d8d016579921417f405f421fd2afe2369ff0a4c5b8aaed44eca7591b43e64db00396cf963cc550753207c9b0e8d21d6b99d8c1ea0faaddb0e9 SHA512 ce6f6aaa21452f60c72498b5410cdc650eed6eec6d949daf7226e93f22d193db175e8051073cbfd258c127ed7cb445d6673ae38f386982dc19632ac55539960e
+DIST argus-clients-3.0.8.4.tar.gz 2773840 BLAKE2B 0b5a24bc6a5c3163a0ac19a3a354e6573491e130c4b854bc4c9b19e6dfa1d27acea8338a88e589043b839994182756b04e205d9ef6815b2f7dc347fb51405c88 SHA512 5b6a03528c31b534d56370b4b8189d223691bb0d8f465349e7850bf54b4663e9851bddb54060a8bc263be3b80f4eab829413a7ff4da312e6640e2f7191d65473
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild
new file mode 100644
index 000000000000..e3762e93f9bc
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="https://openargus.org/"
+SRC_URI="https://github.com/openargus/clients/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/clients-${PV}
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+RDEPEND="
+ 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 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ 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.3-configure-clang16.patch
+ "${FILESDIR}"/${PN}-3.0.8.4-autoconf-2.70.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.3-configure-clang16.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch
new file mode 100644
index 000000000000..ac974dbdf395
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch
@@ -0,0 +1,41 @@
+https://github.com/openargus/clients/pull/7
+
+From 00264608bad9655d72927f31a2b2744b5e2e2e31 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Fri, 25 Nov 2022 19:03:24 +0100
+Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function
+ decls
+
+Implicit function declarations were removed from the C language
+in 1999. Include the relevant header files to ensure that the
+check still works with future compilers. C99 also requires
+to declare the return types of all functions.
+--- a/acsite.m4
++++ b/acsite.m4
+@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
+ # include <sys/types.h>
+ # include <sys/wait.h>
+ # include <stdio.h>
++# include <stdlib.h>
++# include <unistd.h>
+ unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
+- main() {
++ int main() {
+ unsigned int i;
+ pid_t pid;
+ int status;
+--- a/configure
++++ b/configure
+@@ -6711,8 +6711,10 @@ else
+ # include <sys/types.h>
+ # include <sys/wait.h>
+ # include <stdio.h>
++# include <stdlib.h>
++# include <unistd.h>
+ unsigned char a[5] = { 1, 2, 3, 4, 5 };
+- main() {
++ int main() {
+ unsigned int i;
+ pid_t pid;
+ int status;
+
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch
new file mode 100644
index 000000000000..b6a322fb6913
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch
@@ -0,0 +1,55 @@
+https://sources.debian.org/patches/argus-clients/1:3.0.8.2-6.1/0007-Fix-autoconf-2.70-build.patch/
+https://bugs.gentoo.org/808861
+
+From: Boyuan Yang <byang@debian.org>
+Date: Fri, 1 Oct 2021 16:13:38 -0400
+Subject: Fix autoconf 2.70 build
+
+Bug-Debian: https://bugs.debian.org/978769
+--- a/acsite.m4
++++ b/acsite.m4
+@@ -715,13 +715,13 @@ AC_DEFUN([AC_QOSIENT_READLINE], [
+ esac
+ fi
+
+- AC_CHECK_HEADERS(readline/readline.h,
+- AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] ,
+- [
++ AC_CHECK_HEADERS([readline/readline.h],
++ [AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] ,
++ [[
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <readline/readline.h>
+- ]), ac_cv_found_readline=no)
++ ]])], [ac_cv_found_readline=no])
+
+ if test "$ac_cv_found_readline" != no; then
+ $1="-lreadline"
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,17 +41,17 @@ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC
+
+-AC_CHECK_PROGS(V_RANLIB, ranlib, @true)
+-AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_)
++AC_CHECK_PROGS([V_RANLIB], [ranlib], [@true])
++AC_QOSIENT_LEX_AND_YACC([V_LEX], [V_YACC], [argus_])
+
+ # Checks for libraries.
+-AC_QOSIENT_READLINE(V_READLINE, V_INCLS)
++AC_QOSIENT_READLINE([V_READLINE], [V_INCLS])
+
+-CMU_SASL2(V_INCLS)
++CMU_SASL2([V_INCLS])
+ AC_CMU_MYSQL
+
+-AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, uncompress, ZLIB="-lz")])
+-AC_QOSIENT_FLOWTOOLS(V_FLOWTOOLS, V_INCLS)
++AC_CHECK_HEADERS([zlib.h], [AC_CHECK_LIB([z], [uncompress], [ZLIB="-lz"])])
++AC_QOSIENT_FLOWTOOLS([V_FLOWTOOLS], [V_INCLS])
+
+ if test ! -z "$V_FLOWTOOLS"; then
+ AC_DEFINE([ARGUS_FLOWTOOLS], [], [Using Flow Tools library])
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-01 4:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-20 8:19 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/argus-clients/, net-analyzer/argus-clients/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2022-12-01 4:23 Sam James
2021-03-15 21:39 Sam James
2019-02-17 12:54 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox