here's finally an update for argus and argus-clients. lightly tested on amd64, seems to work.
please test / comment / ok. Index: argus/Makefile =================================================================== RCS file: /cvs/ports/net/argus/Makefile,v retrieving revision 1.17 diff -u -p -u -r1.17 Makefile --- argus/Makefile 22 Jan 2015 17:47:51 -0000 1.17 +++ argus/Makefile 23 Jan 2015 21:47:08 -0000 @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.17 2015/01/22 17:47:51 naddy Exp $ +# $OpenBSD$ COMMENT = Audit Record Generation and Utilization System -DISTNAME = argus-3.0.6.1 +DISTNAME = argus-3.0.8 CATEGORIES = net HOMEPAGE = http://qosient.com/argus/ Index: argus/distinfo =================================================================== RCS file: /cvs/ports/net/argus/distinfo,v retrieving revision 1.4 diff -u -p -u -r1.4 distinfo --- argus/distinfo 18 Jan 2015 03:14:37 -0000 1.4 +++ argus/distinfo 23 Jan 2015 21:47:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (argus-3.0.6.1.tar.gz) = 7ZkdjhI5Sk89Sa3wB/grr+YV3k/YNviMhtl/50acrRI= -SIZE (argus-3.0.6.1.tar.gz) = 847095 +SHA256 (argus-3.0.8.tar.gz) = M12InSiHY0h601RcCblE19aqJThjDR/XLuo3BKV79uM= +SIZE (argus-3.0.8.tar.gz) = 1193140 Index: argus/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-Makefile_in,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-Makefile_in --- argus/patches/patch-Makefile_in 8 Jul 2012 19:20:58 -0000 1.3 +++ argus/patches/patch-Makefile_in 23 Jan 2015 21:47:08 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2012/07/08 19:20:58 steven Exp $ ---- Makefile.in.orig Wed Jan 4 01:00:23 2012 -+++ Makefile.in Wed Jun 27 22:25:19 2012 +$OpenBSD$ +--- Makefile.in.orig Mon Aug 11 20:49:58 2014 ++++ Makefile.in Mon Sep 29 23:42:01 2014 @@ -34,7 +34,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ @@ -21,15 +21,15 @@ $OpenBSD: patch-Makefile_in,v 1.3 2012/0 @-for d in $(DIRS); \ do \ -@@ -102,7 +98,6 @@ install-doc: force - $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir) +@@ -100,7 +96,6 @@ install-doc: force + [ -d $(DESTDIR)$(docdir) ] || \ + (mkdir -p $(DESTDIR)$(docdir); chmod 755 $(DESTDIR)$(docdir)) $(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir) - $(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(docdir) uninstall: rm -f $(DESTDIR)@mandir@/man5/argus.5 -@@ -119,7 +114,7 @@ uninstall: +@@ -118,7 +113,7 @@ uninstall: installdirs: ${srcdir}/config/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)\ Index: argus/patches/patch-argus_argus_c =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-argus_argus_c,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-argus_argus_c --- argus/patches/patch-argus_argus_c 8 Jul 2012 19:20:58 -0000 1.3 +++ argus/patches/patch-argus_argus_c 23 Jan 2015 21:47:08 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-argus_argus_c,v 1.3 2012/07/08 19:20:58 steven Exp $ ---- argus/argus.c.orig Fri Apr 13 21:47:27 2012 -+++ argus/argus.c Wed Jun 27 22:31:25 2012 -@@ -294,6 +294,7 @@ main (int argc, char *argv[]) +$OpenBSD: patch-argus_argus_c,v 1.1 2010/11/12 21:03:45 steven Exp $ +--- argus/argus.c.orig Tue Jul 15 03:48:28 2014 ++++ argus/argus.c Mon Sep 29 23:42:01 2014 +@@ -296,6 +296,7 @@ main (int argc, char *argv[]) uflag = 0; pflag = 6; @@ -9,7 +9,7 @@ $OpenBSD: patch-argus_argus_c,v 1.3 2012 if (strchr (argv[0], '/')) { #if defined(HAVE_STRLCPY) -@@ -302,10 +303,9 @@ main (int argc, char *argv[]) +@@ -304,10 +305,9 @@ main (int argc, char *argv[]) bzero(path, MAXPATHNAMELEN); strncpy(path, argv[0], MAXPATHNAMELEN - 1); #endif @@ -21,7 +21,7 @@ $OpenBSD: patch-argus_argus_c,v 1.3 2012 #ifdef HAVE_SYSLOG #ifndef LOG_PERROR -@@ -369,7 +369,7 @@ main (int argc, char *argv[]) +@@ -372,7 +372,7 @@ main (int argc, char *argv[]) setArgusMarReportInterval (ArgusOutputTask,ARGUS_MARSTATUSTIMER); if (!doconf) { @@ -30,7 +30,7 @@ $OpenBSD: patch-argus_argus_c,v 1.3 2012 if (stat (path, &statbuf) == 0) { ArgusParseResourceFile (ArgusModel, path); } -@@ -603,7 +603,7 @@ main (int argc, char *argv[]) +@@ -610,7 +610,7 @@ main (int argc, char *argv[]) if ((status = pthread_attr_init(ArgusAttr)) != 0) ArgusLog (LOG_ERR, "pthreads init error"); Index: argus/patches/patch-support_Config_argus_conf =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-support_Config_argus_conf,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-support_Config_argus_conf --- argus/patches/patch-support_Config_argus_conf 8 Jul 2012 19:20:58 -0000 1.3 +++ argus/patches/patch-support_Config_argus_conf 23 Jan 2015 21:47:08 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-support_Config_argus_conf,v 1.3 2012/07/08 19:20:58 steven Exp $ ---- support/Config/argus.conf.orig Mon Feb 13 18:14:57 2012 -+++ support/Config/argus.conf Wed Jun 27 23:32:21 2012 -@@ -73,6 +73,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +$OpenBSD: patch-support_Config_argus_conf,v 1.1 2010/11/11 19:33:27 steven Exp $ +--- support/Config/argus.conf.orig Fri Jul 25 18:57:28 2014 ++++ support/Config/argus.conf Mon Sep 29 23:43:46 2014 +@@ -78,6 +78,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # #ARGUS_DAEMON=no @@ -9,22 +9,22 @@ $OpenBSD: patch-support_Config_argus_con # Argus Monitor Data is uniquely identifiable based on the source -@@ -211,12 +212,12 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -216,12 +217,13 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # an HTTP service or DNS service, you'll want to turn # promiscuous mode off. # --# The default value is go into prmiscuous mode. -+# The default value is go into promiscuous mode. +-# The default value is goes into prmiscuous mode. ++# The default value is goes into promiscuous mode. # # Commandline equivalent -p # --#ARGUS_GO_PROMISCUOUS=yes + #ARGUS_GO_PROMISCUOUS=yes +ARGUS_GO_PROMISCUOUS=no # Argus supports chroot(2) in order to control the file system that -@@ -258,7 +259,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -248,7 +250,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -u # @@ -33,7 +33,7 @@ $OpenBSD: patch-support_Config_argus_con # Argus can be directed to change its group id using the setgid() system -@@ -271,7 +272,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -261,7 +263,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -g # @@ -42,7 +42,7 @@ $OpenBSD: patch-support_Config_argus_con # Argus can write its output to one or a number of files. -@@ -290,7 +291,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -280,7 +282,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -w # @@ -51,7 +51,7 @@ $OpenBSD: patch-support_Config_argus_con # Argus can push its output to one or a number of remote hosts. -@@ -337,6 +338,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" +@@ -327,6 +329,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # #ARGUS_SET_PID=yes Index: argus-clients/Makefile =================================================================== RCS file: /cvs/ports/net/argus-clients/Makefile,v retrieving revision 1.11 diff -u -p -u -r1.11 Makefile --- argus-clients/Makefile 11 Mar 2013 11:35:45 -0000 1.11 +++ argus-clients/Makefile 23 Jan 2015 21:47:08 -0000 @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2013/03/11 11:35:45 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2012/07/08 19:24:18 steven Exp $ COMMENT = utilities to read and parse Argus data -DISTNAME = argus-clients-3.0.6.2 +DISTNAME = argus-clients-3.0.8 CATEGORIES = net HOMEPAGE = http://qosient.com/argus/ @@ -13,14 +13,15 @@ MAINTAINER = Steven Mestdagh <steven@ope # GPLv2 PERMIT_PACKAGE_CDROM = Yes -WANTLIB = c m ncurses readline z +WANTLIB = c m ncurses readline z pthread ft NO_TEST = Yes LIB_DEPENDS = net/flow-tools CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --with-libft=${LOCALBASE} \ +CONFIGURE_ENV = LOCALBASE=${LOCALBASE} +CONFIGURE_ARGS += --with-libft=yes \ --without-mysql \ --without-GeoIP \ --without-sasl @@ -28,7 +29,7 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/con BUILD_DEPENDS = devel/bison USE_GROFF = Yes -MAKE_FLAGS = CCOPT="${CFLAGS}" +MAKE_FLAGS = CCOPT="${CFLAGS}" COMPATLIB="-lm -lz -L${LOCALBASE}/lib -lft" FAKE_FLAGS = docdir=${PREFIX}/share/doc/argus-clients/ post-extract: @@ -37,6 +38,7 @@ post-extract: post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/argus/ mv ${PREFIX}/argus/* ${PREFIX}/share/argus/ + rmdir ${PREFIX}/argus ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/argus-clients/ cd ${WRKSRC}/support && tar cf - . | \ tar -C ${PREFIX}/share/examples/argus-clients/ -xf - Index: argus-clients/distinfo =================================================================== RCS file: /cvs/ports/net/argus-clients/distinfo,v retrieving revision 1.4 diff -u -p -u -r1.4 distinfo --- argus-clients/distinfo 18 Jan 2015 03:14:37 -0000 1.4 +++ argus-clients/distinfo 23 Jan 2015 21:47:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (argus-clients-3.0.6.2.tar.gz) = 9R18jRj6Ijbz/jcm3rPAuDCMCmynZ8YImBGWPalTMPw= -SIZE (argus-clients-3.0.6.2.tar.gz) = 2426454 +SHA256 (argus-clients-3.0.8.tar.gz) = ruhYXVCVngAHCjgvMSHt+qhEoKUdwLc+34TA9OuJEsk= +SIZE (argus-clients-3.0.8.tar.gz) = 2627515 Index: argus-clients/patches/patch-common_argus_main_c =================================================================== RCS file: /cvs/ports/net/argus-clients/patches/patch-common_argus_main_c,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-common_argus_main_c --- argus-clients/patches/patch-common_argus_main_c 8 Jul 2012 19:24:18 -0000 1.2 +++ argus-clients/patches/patch-common_argus_main_c 23 Jan 2015 21:47:08 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-common_argus_main_c,v 1.2 2012/07/08 19:24:18 steven Exp $ ---- common/argus_main.c.orig Tue Apr 17 18:22:02 2012 -+++ common/argus_main.c Wed Jun 27 22:51:25 2012 -@@ -116,7 +116,7 @@ main (int argc, char **argv) +$OpenBSD$ +--- common/argus_main.c.orig Mon Jun 9 20:18:59 2014 ++++ common/argus_main.c Mon Sep 29 23:50:59 2014 +@@ -114,7 +114,7 @@ main (int argc, char **argv) #if defined(ARGUS_THREADS) int hosts = 0; pthread_attr_t attr; @@ -9,8 +9,8 @@ $OpenBSD: patch-common_argus_main_c,v 1. +#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) && !defined(sun) && !defined(CYGWIN) int thread_policy; struct sched_param thread_param; - #if defined(HAVE_SCHED_GET_PRIORITY_MIN) -@@ -140,7 +140,7 @@ main (int argc, char **argv) + #if HAVE_SCHED_GET_PRIORITY_MIN +@@ -138,7 +138,7 @@ main (int argc, char **argv) if ((status = pthread_attr_init(&attr)) != 0) ArgusLog (LOG_ERR, "pthreads init error"); Index: argus-clients/patches/patch-common_argus_util_c =================================================================== RCS file: /cvs/ports/net/argus-clients/patches/patch-common_argus_util_c,v retrieving revision 1.3 diff -u -p -u -r1.3 patch-common_argus_util_c --- argus-clients/patches/patch-common_argus_util_c 8 Jul 2012 19:24:18 -0000 1.3 +++ argus-clients/patches/patch-common_argus_util_c 23 Jan 2015 21:47:08 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-common_argus_util_c,v 1.3 2012/07/08 19:24:18 steven Exp $ ---- common/argus_util.c.orig Tue Apr 17 18:22:02 2012 -+++ common/argus_util.c Wed Jun 27 22:51:25 2012 -@@ -20457,8 +20457,8 @@ ArgusLog (int priority, char *fmt, ...) +$OpenBSD$ +--- common/argus_util.c.orig Tue Aug 19 23:13:08 2014 ++++ common/argus_util.c Mon Sep 29 23:50:59 2014 +@@ -22553,8 +22553,8 @@ ArgusLog (int priority, char *fmt, ...) *tptr++ = buf[i]; } Index: argus-clients/patches/patch-configure =================================================================== RCS file: argus-clients/patches/patch-configure diff -N argus-clients/patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ argus-clients/patches/patch-configure 23 Jan 2015 21:47:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.orig Wed Aug 27 00:42:06 2014 ++++ configure Fri Jan 23 22:13:51 2015 +@@ -5780,7 +5780,7 @@ if ${ac_cv_lib_ft_main+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lft $LIBS" ++LIBS="-L${LOCALBASE}/lib -lft $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + Index: argus-clients/patches/patch-examples_radump_Makefile_in =================================================================== RCS file: argus-clients/patches/patch-examples_radump_Makefile_in diff -N argus-clients/patches/patch-examples_radump_Makefile_in --- argus-clients/patches/patch-examples_radump_Makefile_in 8 Jul 2012 19:24:18 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-examples_radump_Makefile_in,v 1.1 2012/07/08 19:24:18 steven Exp $ ---- examples/radump/Makefile.in.orig Wed Jun 27 23:14:08 2012 -+++ examples/radump/Makefile.in Wed Jun 27 23:14:47 2012 -@@ -110,7 +110,7 @@ install: force all - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) - -- $(INSTALL) $(PROGS) $(BINDIR) -+ $(INSTALL) $(PROGS) $(DESTDIR)$(BINDIR) - - clean: - rm -f $(CLEANFILES) Index: argus-clients/patches/patch-examples_ratop_Makefile_in =================================================================== RCS file: argus-clients/patches/patch-examples_ratop_Makefile_in diff -N argus-clients/patches/patch-examples_ratop_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ argus-clients/patches/patch-examples_ratop_Makefile_in 23 Jan 2015 21:47:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- examples/ratop/Makefile.in.orig Fri Jan 23 21:04:33 2015 ++++ examples/ratop/Makefile.in Fri Jan 23 21:04:49 2015 +@@ -93,7 +93,7 @@ PROGS = $(INSTALLBIN)/ratop + all: $(PROGS) + + $(INSTALLBIN)/ratop: $(OBJ) $(LIB) +- $(CC) $(CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(LIB) $(COMPATLIB) $(CURSESLIB) ++ $(CC) $(CFLAGS) -o $@ $(OBJ) $(LDFLAGS) $(LIB) $(COMPATLIB) $(CURSESLIB) -lpthread + + CLEANFILES = $(OBJ) $(PROGS) + Index: argus-clients/patches/patch-examples_ratop_racurses_h =================================================================== RCS file: argus-clients/patches/patch-examples_ratop_racurses_h diff -N argus-clients/patches/patch-examples_ratop_racurses_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ argus-clients/patches/patch-examples_ratop_racurses_h 23 Jan 2015 21:47:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- examples/ratop/racurses.h.orig Fri Jan 23 20:55:46 2015 ++++ examples/ratop/racurses.h Fri Jan 23 20:57:01 2015 +@@ -60,6 +60,8 @@ + #include <ctype.h> + #include <errno.h> + ++#include <pthread.h> ++ + #if defined(HAVE_IFADDRS_H) && HAVE_IFADDRS_H + #define HAVE_GETIFADDRS + #include <sys/types.h> Index: argus-clients/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -r1.3 PLIST --- argus-clients/pkg/PLIST 8 Jul 2012 19:24:18 -0000 1.3 +++ argus-clients/pkg/PLIST 23 Jan 2015 21:47:08 -0000 @@ -1,6 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2012/07/08 19:24:18 steven Exp $ -@comment bin/argusbug -@comment argus/ +@comment $OpenBSD$ bin/argusclientbug @bin bin/ra @bin bin/rabins @@ -8,7 +6,7 @@ bin/argusclientbug @bin bin/raconvert @bin bin/racount bin/radark -@bin bin/radium +bin/radecode @bin bin/radump @bin bin/raevent @bin bin/rafilteraddr @@ -16,11 +14,9 @@ bin/ragraph @bin bin/ragrep @bin bin/rahisto bin/rahosts -bin/raips @bin bin/ralabel @bin bin/ranonymize @bin bin/rapath -bin/raplot @bin bin/rapolicy bin/raports @bin bin/rarpwatch @@ -74,6 +70,7 @@ include/argus/argus_metric.h include/argus/argus_namedb.h include/argus/argus_os.h include/argus/argus_out.h +include/argus/argus_output.h include/argus/argus_parser.h include/argus/argus_sort.h include/argus/argus_udt.h @@ -84,19 +81,18 @@ include/argus/net/nff.h include/argus/netinet/ include/argus/netinet/rtp.h include/argus/rabins.h -include/argus/radium.h include/argus/rapolicy.h include/argus/rasplit.h lib/argus_client.a lib/argus_common.a lib/argus_parse.a -lib/pkgconfig/ lib/pkgconfig/argus-clients.pc @man man/man1/ra.1 @man man/man1/rabins.1 @man man/man1/racluster.1 @man man/man1/raconvert.1 @man man/man1/racount.1 +@man man/man1/radecode.1 @man man/man1/radump.1 @man man/man1/raevent.1 @man man/man1/rafilteraddr.1 @@ -114,7 +110,9 @@ lib/pkgconfig/argus-clients.pc @man man/man1/rasqltimeindex.1 @man man/man1/rastream.1 @man man/man1/rastrip.1 +@man man/man1/ratop.1 @man man/man5/racluster.5 +@man man/man5/racolor.conf.5 @man man/man5/radium.conf.5 @man man/man5/ralabel.conf.5 @man man/man5/ranonymize.5 @@ -133,17 +131,23 @@ share/doc/argus-clients/README share/examples/argus-clients/ share/examples/argus-clients/Config/ share/examples/argus-clients/Config/README +share/examples/argus-clients/Config/apt1.ipv4.addrs +share/examples/argus-clients/Config/continent.txt share/examples/argus-clients/Config/delegated-ipv4-latest +share/examples/argus-clients/Config/duration.classifier.labels share/examples/argus-clients/Config/excel.rc share/examples/argus-clients/Config/iana-address-file share/examples/argus-clients/Config/iana-ipv4-address share/examples/argus-clients/Config/iana-multicast-address share/examples/argus-clients/Config/iana-port-numbers +share/examples/argus-clients/Config/local.addrs share/examples/argus-clients/Config/racluster.conf +share/examples/argus-clients/Config/racolor.conf share/examples/argus-clients/Config/radium.conf share/examples/argus-clients/Config/ragetcountrycodes.sh share/examples/argus-clients/Config/ralabel.conf share/examples/argus-clients/Config/ranonymize.conf +share/examples/argus-clients/Config/rapolicy.conf share/examples/argus-clients/Config/rarc share/examples/argus-clients/Config/rarc.print.all.conf share/examples/argus-clients/Config/rastream.sh
