gentoo auto-resync : 01:12:2022 - 20:53:45

5 files changed, 187 insertions, 7 deletions

diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest
index 558d1120fcbb..100e062f21c6 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -3,6 +3,10 @@ AUX argus-clients-3.0.7.21-curses-readline.patch 611 BLAKE2B 046d31d75bef26da50b
 AUX argus-clients-3.0.8.2-ar.patch 767 BLAKE2B b13abee07d0d11319890e36d0dd3f446996eb0fe5ddda70d834873349c5b9bfdaa2029526ce2146efb88887b454c6019462908786f47b372e1d2de4f52a8dadf SHA512 793dec8cf09bb730b327a6af35e89b029922329d5e031767b840b1c974dd0ed3482f5590ee6b3f76480d0518139281474c849797df70ddd3013ac06822d0575a
 AUX argus-clients-3.0.8.2-curses-readline.patch 777 BLAKE2B 374420361e1cca506e51fa977ad1da0c37fb3596e181a6880e09b9392fc7926f98fe52f78c7d7b09cb237e64253ce78deb46fb545fd349431fb62b8bafc31316 SHA512 f6fbcb3a4aed87214dc1d08c9a7b5b807cea88a1789e7487f0b0b30896e6d1c7a3cf21b04d7d8afbcfb5f205edce5b5a50a8d67cd3556d9badbeecc103f98770
 AUX argus-clients-3.0.8.2-my_bool.patch 1276 BLAKE2B e6379b42be86bc5a55af64519caf5e5fa9a3b9256ae56ab2a972ae438cd60e16260cab66f47150cd9f63664543625e08a3f45849019afd1b32f958e02a2fffa3 SHA512 b5a71da8037889ee84403f13cbe2bb55e67caa1486fba7f6259a4ad417939264f6d6d4bc14c9b15f45ef697b556717d9dd0d056a7f2615aa5f31705b912563e5
+AUX argus-clients-3.0.8.3-configure-clang16.patch 1231 BLAKE2B db60b5a763e4399f17804f0b31bc7b6a14d3ef6c8a175c92c561a286653b4c8f96f5248d3f7de03c09b856c1aac29590c1ff15e0ed9e39ea0d3403fd2a882baa SHA512 a4c487c6c28ce1abafcdb188b427bf64efb983bfc3f6860588526be9b5c38285a5a0fb86c79ce1222ad069fe8bb2e7d961e371273d926ddbf32cb226a7325cde
+AUX argus-clients-3.0.8.4-autoconf-2.70.patch 1991 BLAKE2B a427573acefd042e7a1b4971a79cad08c79ffe94c4ff3f8583ffa3ea3180d920a001023a6a80df8293c8bbaa3cb16f50b0b508cb92c383ef044971d5b6cc2ccf SHA512 2ba0048229a695d72eeb9662fe7bc368ab21897b8092f6aeeac923fc4e484d1eef5fa2e5b19449a74755626989127c0461dd65f84957e17581303dd418c9667f
 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
 EBUILD argus-clients-3.0.8.3.ebuild 1515 BLAKE2B 0f57ac0135c8f41a205a91f4f58c7eeea3fc08fd6458b456716f24ad1c9673e00cb222f182115a7c67f47dd4becd114c48140dea4c604aee9399d8216f27835c SHA512 94cd545aca182702e25b29774bbb7cd191a96e709ad882a8434a2b09b482496d7865938c82006f6473a27b2c3771a5816868c1e58d3c112ca32ab9103e8b6d5d
-MISC metadata.xml 384 BLAKE2B 9752e5335c1ac3c965dd32dd18738a69be73caa8a055a424c14ede4ee077b6084dc9f8cc3d0908c13ed9dc3ce26cdb1b2335634ead4594c12d242424ad43b30a SHA512 251db762aa813d4037eb8e7617efcfceb46eeec6be6cfbb755146cea3edbebb7e4bc5eeb0d38314ae5ca3a2311ccd96750e4c9d43692f9d89cc7bc57ec2152b6
+EBUILD argus-clients-3.0.8.4.ebuild 1659 BLAKE2B a364e5c04e4bda9a0b8e34e4effc8ad641df8d72f9032dac1a1873dde23776212d89cb15675fb5173658971741f4d6a0a5ba205a35e9060bc42a93647a65d5cb SHA512 3d0da7c36f9b37aa91164dbb03af40e464d33ca077286a6e1b14aa7738309af6b202bc0bcba7c22f96a7745dbda815537f01325bba3f5e989f58e7ebbaf09e27
+MISC metadata.xml 478 BLAKE2B cf272a8304aac515a3d31880a655e5d3425df1977666466f9589981d0b4add05f5a7b263a39ab2d1eb3b7099e07db0e0a518088e709521c52dde4ad45d8cd21c SHA512 bc5f2c51bbddbdbab7e4737e699c9f71ba43f342a164726bbde48f31de83ef124d8b303491a2bf4f440b58e7a2fbcbca1f6ff2b3d0c2fcef9f48d5033585d727
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])
+
diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml
index 3c7f800f1c84..08109ceb82f0 100644
--- a/net-analyzer/argus-clients/metadata.xml
+++ b/net-analyzer/argus-clients/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<use><flag name="ft">Enable support for flow packets through
-<pkg>net-analyzer/flow-tools</pkg></flag></use>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="ft">Enable support for flow packets through <pkg>net-analyzer/flow-tools</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">openargus/clients</remote-id>
+	</upstream>
 </pkgmetadata>