anyone who uses this, please give following update a try. comments welcome of course.
Index: argus/Makefile =================================================================== RCS file: /cvs/ports/net/argus/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- argus/Makefile 4 Jul 2008 17:23:39 -0000 1.2 +++ argus/Makefile 10 Apr 2010 11:14:19 -0000 @@ -2,8 +2,7 @@ COMMENT= Audit Record Generation and Utilization System -DISTNAME= argus-3.0.0 -PKGNAME= ${DISTNAME}p0 +DISTNAME= argus-3.0.2 CATEGORIES= net HOMEPAGE= http://qosient.com/argus/ @@ -26,9 +25,11 @@ BUILD_DEPENDS= ::devel/bison MAKE_FLAGS= CCOPT= -INSTALL_TARGET= install install-doc +INSTALL_TARGET= install post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/argus/ + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/argus/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/argus/ cd ${WRKSRC}/support && tar cf - . | \ tar -C ${PREFIX}/share/examples/argus/ -xf - Index: argus/distinfo =================================================================== RCS file: /cvs/ports/net/argus/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- argus/distinfo 30 Jun 2008 05:19:33 -0000 1.1.1.1 +++ argus/distinfo 10 Apr 2010 11:14:19 -0000 @@ -1,5 +1,5 @@ -MD5 (argus-3.0.0.tar.gz) = Uy3Z2G2swrSX4kd2wsfrlg== -RMD160 (argus-3.0.0.tar.gz) = zhSNGgvAOG9nxJoaRFLX0HJu33A= -SHA1 (argus-3.0.0.tar.gz) = sG7UtOekCeZGrISB424VLyTKyAM= -SHA256 (argus-3.0.0.tar.gz) = wsQJA+1ZLwRbc+6U6EQx5Ny7XvnQfG2Wfa8WBo7Sgs8= -SIZE (argus-3.0.0.tar.gz) = 400426 +MD5 (argus-3.0.2.tar.gz) = fcbr4DvIQKd33ZNEfSaaMQ== +RMD160 (argus-3.0.2.tar.gz) = 0zM4hrN6ZdBYaZvGOHcfMJF7cpU= +SHA1 (argus-3.0.2.tar.gz) = Z04JxlSIyn1Xz9/LM/bP2N8BUtU= +SHA256 (argus-3.0.2.tar.gz) = uXRTc5Ra5NQilzglmAWHfwm1Mf7qYpY3J2EmVpleHVA= +SIZE (argus-3.0.2.tar.gz) = 392854 Index: argus/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-Makefile_in --- argus/patches/patch-Makefile_in 30 Jun 2008 05:19:33 -0000 1.1.1.1 +++ argus/patches/patch-Makefile_in 10 Apr 2010 11:14:19 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/06/30 05:19:33 steven Exp $ ---- Makefile.in.orig Wed Feb 13 06:16:07 2008 -+++ Makefile.in Mon Jun 23 22:04:09 2008 +$OpenBSD$ +--- Makefile.in.orig Wed Oct 7 19:13:20 2009 ++++ Makefile.in Sat Apr 10 12:32:04 2010 @@ -34,7 +34,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ @@ -18,10 +18,10 @@ - (mkdir -p $(DESTDIR)$(exec_prefix)/argus; chmod 755 $(DESTDIR)$(exec_prefix)/argus) - [ -d $(DESTDIR)$(exec_prefix)/argus/archive ] || \ - (mkdir -p $(DESTDIR)$(exec_prefix)/argus/archive; chmod 755 $(DESTDIR)$(exec_prefix)/argus/archive) + @-for d in $(INSTDIRS); \ do \ - (cd $$d; echo "### Make install in" `pwd`; \ -@@ -99,7 +95,6 @@ install-doc: force +@@ -100,7 +96,6 @@ install-doc: force $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DESTDIR)$(docdir) $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DESTDIR)$(docdir) $(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir) @@ -29,7 +29,7 @@ uninstall: rm -f $(DESTDIR)@mandir@/man5/argus.5 -@@ -116,7 +111,7 @@ uninstall: +@@ -117,7 +112,7 @@ uninstall: installdirs: ${srcdir}/config/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)\ Index: argus/patches/patch-common_argus_util_c =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-common_argus_util_c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-common_argus_util_c --- argus/patches/patch-common_argus_util_c 30 Jun 2008 05:19:33 -0000 1.1.1.1 +++ argus/patches/patch-common_argus_util_c 10 Apr 2010 11:14:19 -0000 @@ -1,10 +1,10 @@ -$OpenBSD: patch-common_argus_util_c,v 1.1.1.1 2008/06/30 05:19:33 steven Exp $ +$OpenBSD$ work around reading the wrong piece of memory on sparc64. ---- common/argus_util.c.orig Wed Jun 25 07:05:41 2008 -+++ common/argus_util.c Wed Jun 25 07:07:37 2008 -@@ -1911,11 +1911,12 @@ print_time(struct timeval *tvp) +--- common/argus_util.c.orig Mon Aug 17 16:35:18 2009 ++++ common/argus_util.c Sat Apr 10 12:33:38 2010 +@@ -1916,11 +1916,12 @@ print_time(struct timeval *tvp) char timeZoneBuf[32]; char *retn = ArgusPrintTimeBuf, *ptr; struct tm *tm, tmbuf; @@ -15,6 +15,6 @@ - if ((tm = localtime_r ((time_t *)&tvp->tv_sec, &tmbuf)) != NULL) { + if ((tm = localtime_r (&sec, &tmbuf)) != NULL) { - if (uflag) - snprintf (retn, 32, "%9d", (int) tvp->tv_sec); - else + #if !defined(HAVE_STRFTIME) + snprintf (retn, 32, "%9d", (int) tvp->tv_sec); + #else Index: argus/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/argus/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- argus/pkg/PLIST 4 Jul 2008 17:23:39 -0000 1.2 +++ argus/pkg/PLIST 10 Apr 2010 11:14:19 -0000 @@ -6,8 +6,6 @@ @man man/man8/argus.8 @bin sbin/argus share/doc/argus/ -share/doc/argus/FAQ -share/doc/argus/HOW-TO share/doc/argus/README share/examples/argus/ share/examples/argus/Archive/ @@ -23,7 +21,7 @@ share/examples/argus/System/ share/examples/argus/System/crontab share/examples/argus/System/magic +...@mode 770 @owner _argus @group _argus -...@mode 770 @sample /var/argus/ Index: argus-clients/Makefile =================================================================== RCS file: /cvs/ports/net/argus-clients/Makefile,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 Makefile --- argus-clients/Makefile 30 Jun 2008 05:20:42 -0000 1.1.1.1 +++ argus-clients/Makefile 10 Apr 2010 11:14:19 -0000 @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/06/30 05:20:42 steven Exp $ +# $OpenBSD$ COMMENT= utilities to read and parse Argus data -DISTNAME= argus-clients-3.0.0 +DISTNAME= argus-clients-3.0.2 CATEGORIES= net HOMEPAGE= http://qosient.com/argus/ @@ -16,7 +16,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m ncurses +WANTLIB= c m ncurses readline NO_REGRESS= Yes Index: argus-clients/distinfo =================================================================== RCS file: /cvs/ports/net/argus-clients/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- argus-clients/distinfo 30 Jun 2008 05:20:42 -0000 1.1.1.1 +++ argus-clients/distinfo 10 Apr 2010 11:14:19 -0000 @@ -1,5 +1,5 @@ -MD5 (argus-clients-3.0.0.tar.gz) = aSIMiYwKOtYSKS6uzexw0g== -RMD160 (argus-clients-3.0.0.tar.gz) = 7aS8rsXsU1KP6yM24xGr5xm3tDg= -SHA1 (argus-clients-3.0.0.tar.gz) = 0wVb7YBQzH4T8wxg7BdoPljU4Tw= -SHA256 (argus-clients-3.0.0.tar.gz) = 87WzfGmw63879WGiVwmQDile4V3mkADUx9FlaE6+eD0= -SIZE (argus-clients-3.0.0.tar.gz) = 1421803 +MD5 (argus-clients-3.0.2.tar.gz) = PT6fTOBTn4Mgw4zUP87LwQ== +RMD160 (argus-clients-3.0.2.tar.gz) = T2mNFAS4M8hFQnxA6dzMxjf4/IE= +SHA1 (argus-clients-3.0.2.tar.gz) = Mykh4c/PG9dlOR0np0TU5zG3vX0= +SHA256 (argus-clients-3.0.2.tar.gz) = aP/Baf9NbkwIwZUigzyCmy5WDuYbd5p6TxZsHPAip8Q= +SIZE (argus-clients-3.0.2.tar.gz) = 1802627 Index: argus-clients/patches/patch-Makefile_in =================================================================== RCS file: argus-clients/patches/patch-Makefile_in diff -N argus-clients/patches/patch-Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ argus-clients/patches/patch-Makefile_in 10 Apr 2010 11:14:19 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- Makefile.in.orig Sat Apr 10 12:56:00 2010 ++++ Makefile.in Sat Apr 10 12:56:09 2010 +@@ -37,7 +37,7 @@ exec_prefix = @exec_prefix@ + datarootdir = @datarootdir@ + + srcdir = @srcdir@ +-docdir = @datadir@/doc/argus-clients-3.0 ++docdir = @datadir@/doc/argus-clients + + #### End of system configuration section. #### + Index: argus-clients/patches/patch-clients_Makefile_in =================================================================== RCS file: /cvs/ports/net/argus-clients/patches/patch-clients_Makefile_in,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-clients_Makefile_in --- argus-clients/patches/patch-clients_Makefile_in 30 Jun 2008 05:20:42 -0000 1.1.1.1 +++ argus-clients/patches/patch-clients_Makefile_in 10 Apr 2010 11:14:19 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-clients_Makefile_in,v 1.1.1.1 2008/06/30 05:20:42 steven Exp $ ---- clients/Makefile.in.orig Wed Jun 25 23:35:01 2008 -+++ clients/Makefile.in Wed Jun 25 23:38:04 2008 -@@ -141,13 +141,13 @@ all: $(PROGS) +$OpenBSD$ +--- clients/Makefile.in.orig Fri May 15 19:49:11 2009 ++++ clients/Makefile.in Sat Apr 10 12:50:16 2010 +@@ -146,13 +146,13 @@ all: $(PROGS) $(CC) $(CCOPT) -o $@ ratree.o $(LIB) $(COMPATLIB) @INSTALL_BIN@/raports: raports.pl @@ -16,5 +16,5 @@ - $(INSTALL) radark.pl $@ + cp radark.pl $@ - @INSTALL_BIN@/ratemplate: ratemplate.o $(LIB) - $(CC) $(CCOPT) -o $@ ratemplate.o $(LIB) $(COMPATLIB) + @INSTALL_BIN@/rauserdata: rauserdata.o $(LIB) + $(CC) $(CCOPT) -o $@ rauserdata.o $(LIB) $(COMPATLIB) 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.1.1.1 diff -u -r1.1.1.1 patch-common_argus_util_c --- argus-clients/patches/patch-common_argus_util_c 30 Jun 2008 05:20:42 -0000 1.1.1.1 +++ argus-clients/patches/patch-common_argus_util_c 10 Apr 2010 11:14:19 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-common_argus_util_c,v 1.1.1.1 2008/06/30 05:20:42 steven Exp $ ---- common/argus_util.c.orig Wed Jun 25 23:43:02 2008 -+++ common/argus_util.c Wed Jun 25 23:43:26 2008 -@@ -15424,8 +15424,8 @@ ArgusLog (int priority, char *fmt, ...) +$OpenBSD$ +--- common/argus_util.c.orig Thu Dec 10 18:17:54 2009 ++++ common/argus_util.c Sat Apr 10 12:50:16 2010 +@@ -17563,8 +17563,8 @@ ArgusLog (int priority, char *fmt, ...) *tptr++ = buf[i]; } @@ -10,5 +10,5 @@ + memset(buf, 0, sizeof(buf)); + strncpy(buf, tbuf, sizeof(buf)); } - + syslog (priority, buf); Index: argus-clients/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- argus-clients/pkg/PLIST 30 Jun 2008 05:20:42 -0000 1.1.1.1 +++ argus-clients/pkg/PLIST 10 Apr 2010 11:14:19 -0000 @@ -1,4 +1,4 @@ -...@comment $OpenBSD: PLIST,v 1.1.1.1 2008/06/30 05:20:42 steven Exp $ +...@comment $OpenBSD$ @comment argus/ @comment bin/argusbug @bin bin/ra @@ -9,7 +9,6 @@ @bin bin/radump @bin bin/rafilteraddr bin/ragraph -...@bin bin/ragrep @bin bin/rahisto bin/rahosts @bin bin/ralabel @@ -17,6 +16,7 @@ @bin bin/rapath @bin bin/rapolicy bin/raports +...@bin bin/raservices @bin bin/rasort @bin bin/rasplit @bin bin/rastream @@ -25,13 +25,14 @@ @bin bin/ratimerange @bin bin/ratop @bin bin/ratree +...@bin bin/rauserdata @man man/man1/ra.1 @man man/man1/rabins.1 @man man/man1/racluster.1 @man man/man1/racount.1 @man man/man1/ragraph.1 -...@man man/man1/ragrep.1 @man man/man1/rahisto.1 +...@man man/man1/ranonymize.1 @man man/man1/rasort.1 @man man/man1/rasplit.1 @man man/man1/rastream.1 @@ -46,20 +47,53 @@ share/argus/delegated-ipv4-latest @comment share/argus/lib/ @comment share/argus/rarc +share/doc/argus-clients/ +share/doc/argus-clients/CHANGES +share/doc/argus-clients/COPYING +share/doc/argus-clients/FAQ +share/doc/argus-clients/HOW-TO +share/doc/argus-clients/README +share/doc/argus-clients/html/ +share/doc/argus-clients/html/man/ +share/doc/argus-clients/html/man/man1/ +share/doc/argus-clients/html/man/man1/ra.1.html +share/doc/argus-clients/html/man/man1/rabins.1.html +share/doc/argus-clients/html/man/man1/racluster.1.html +share/doc/argus-clients/html/man/man1/racount.1.html +share/doc/argus-clients/html/man/man1/ragraph.1.html +share/doc/argus-clients/html/man/man1/ragrep.1.html +share/doc/argus-clients/html/man/man1/rahisto.1.html +share/doc/argus-clients/html/man/man1/ranonymize.1.html +share/doc/argus-clients/html/man/man1/rapolicy.1.html +share/doc/argus-clients/html/man/man1/rasort.1.html +share/doc/argus-clients/html/man/man1/rasplit.1.html +share/doc/argus-clients/html/man/man1/rastrip.1.html +share/doc/argus-clients/html/man/man5/ +share/doc/argus-clients/html/man/man5/racluster.5.html +share/doc/argus-clients/html/man/man5/radium.conf.5.html +share/doc/argus-clients/html/man/man5/ranonymize.5.html +share/doc/argus-clients/html/man/man5/rarc.5.html +share/doc/argus-clients/html/man/man8/ +share/doc/argus-clients/html/man/man8/radium.8.html share/examples/argus-clients/ share/examples/argus-clients/Config/ share/examples/argus-clients/Config/delegated-ipv4-latest 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/ra.print.all.conf share/examples/argus-clients/Config/racluster.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/rarc share/examples/argus-clients/Config/rastream.sh +share/examples/argus-clients/Config/std.sig share/examples/argus-clients/Startup/ share/examples/argus-clients/Startup/radium share/examples/argus-clients/System/ share/examples/argus-clients/System/magic share/examples/argus-clients/System/protocols -share/examples/argus-clients/Xml/