Steven Mestdagh [2012-06-28, 00:17:21]: > Here's an update to 3.0.6. Please test/comment.
and here's a diff that should work better. Index: argus/Makefile =================================================================== RCS file: /cvs/ports/net/argus/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- argus/Makefile 17 May 2012 07:44:40 -0000 1.14 +++ argus/Makefile 28 Jun 2012 05:48:13 -0000 @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.14 2012/05/17 07:44:40 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2011/11/16 00:10:31 sthen Exp $ COMMENT = Audit Record Generation and Utilization System -DISTNAME = argus-3.0.2 -REVISION = 6 +DISTNAME = argus-3.0.6 CATEGORIES = net HOMEPAGE = http://qosient.com/argus/ @@ -17,7 +16,7 @@ PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m pcap +WANTLIB = c m pcap z USE_GROFF = Yes NO_REGRESS = Yes @@ -26,7 +25,7 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config BUILD_DEPENDS = devel/bison -MAKE_FLAGS = CCOPT= +MAKE_FLAGS = CCOPT="${CFLAGS}" INSTALL_TARGET = install post-install: Index: argus/distinfo =================================================================== RCS file: /cvs/ports/net/argus/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- argus/distinfo 15 Apr 2010 19:15:19 -0000 1.2 +++ argus/distinfo 28 Jun 2012 05:48:13 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (argus-3.0.6.tar.gz) = 29+PDEgH+jPcArNwiYf7EA== +RMD160 (argus-3.0.6.tar.gz) = fD3Pgg8WQJo5PlaLaEMLLZNd0sA= +SHA1 (argus-3.0.6.tar.gz) = b47q/FCvzP9TttFJ/8tR4w9/Nbo= +SHA256 (argus-3.0.6.tar.gz) = 13WnW5VIGHSWIXsB3Q7zRVpNbVYvsHpX5RlEUjXCjQs= +SIZE (argus-3.0.6.tar.gz) = 829744 Index: argus/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-Makefile_in,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile_in --- argus/patches/patch-Makefile_in 15 Apr 2010 19:15:19 -0000 1.2 +++ argus/patches/patch-Makefile_in 28 Jun 2012 05:48:13 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2010/04/15 19:15:19 steven Exp $ ---- Makefile.in.orig Wed Oct 7 19:13:20 2009 -+++ Makefile.in Sat Apr 10 12:32:04 2010 +$OpenBSD$ +--- Makefile.in.orig Wed Jan 4 01:00:23 2012 ++++ Makefile.in Wed Jun 27 22:25:19 2012 @@ -34,7 +34,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ datarootdir = @datarootdir@ @@ -19,9 +19,9 @@ - [ -d $(DESTDIR)$(exec_prefix)/argus/archive ] || \ - (mkdir -p $(DESTDIR)$(exec_prefix)/argus/archive; chmod 755 $(DESTDIR)$(exec_prefix)/argus/archive) - @-for d in $(INSTDIRS); \ + @-for d in $(DIRS); \ do \ -@@ -100,7 +96,6 @@ install-doc: force +@@ -102,7 +98,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 -@@ -117,7 +112,7 @@ uninstall: +@@ -119,7 +114,7 @@ uninstall: installdirs: ${srcdir}/config/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)\ Index: argus/patches/patch-argus_Makefile_in =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-argus_Makefile_in,v retrieving revision 1.1 diff -u -r1.1 patch-argus_Makefile_in --- argus/patches/patch-argus_Makefile_in 10 Sep 2011 11:55:26 -0000 1.1 +++ argus/patches/patch-argus_Makefile_in 28 Jun 2012 05:48:13 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-argus_Makefile_in,v 1.1 2011/09/10 11:55:26 naddy Exp $ ---- argus/Makefile.in.orig Thu Sep 8 17:36:27 2011 -+++ argus/Makefile.in Thu Sep 8 17:38:25 2011 +$OpenBSD$ +--- argus/Makefile.in.orig Wed Jan 4 01:15:19 2012 ++++ argus/Makefile.in Wed Jun 27 22:27:06 2012 @@ -19,6 +19,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -9,12 +9,12 @@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ -@@ -45,7 +46,7 @@ WRAPLIBS = @WRAPLIBS@ +@@ -46,7 +47,7 @@ SASLLIBS = @LIB_SASL@ CC = @CC@ CCOPT = @V_CCOPT@ INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include --DEFS = @DEFS@ -DARGUS_SYSLOG=1 -+DEFS = @DEFS@ -DARGUS_SYSLOG=1 -DSYSCONFDIR=\"$(sysconfdir)\" +-DEFS = @DEFS@ ++DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\" #DEFS = -DARGUSPERFMETRICS=1 @DEFS@ Index: argus/patches/patch-argus_argus_c =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-argus_argus_c,v retrieving revision 1.2 diff -u -r1.2 patch-argus_argus_c --- argus/patches/patch-argus_argus_c 17 May 2012 05:01:35 -0000 1.2 +++ argus/patches/patch-argus_argus_c 28 Jun 2012 05:48:13 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-argus_argus_c,v 1.2 2012/05/17 05:01:35 ajacoutot Exp $ ---- argus/argus.c.orig Tue Nov 10 10:43:21 2009 -+++ argus/argus.c Tue May 15 22:43:51 2012 -@@ -243,6 +243,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 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[]) uflag = 0; pflag = 6; @@ -9,7 +9,7 @@ if (strchr (argv[0], '/')) { #if defined(HAVE_STRLCPY) -@@ -251,10 +252,9 @@ main (int argc, char *argv[]) +@@ -302,10 +303,9 @@ main (int argc, char *argv[]) bzero(path, MAXPATHNAMELEN); strncpy(path, argv[0], MAXPATHNAMELEN - 1); #endif @@ -19,9 +19,9 @@ - ArgusProgramName = argv[0]; - #ifdef ARGUS_SYSLOG + #ifdef HAVE_SYSLOG #ifndef LOG_PERROR -@@ -318,7 +318,7 @@ main (int argc, char *argv[]) +@@ -369,7 +369,7 @@ main (int argc, char *argv[]) setArgusMarReportInterval (ArgusOutputTask,ARGUS_MARSTATUSTIMER); if (!doconf) { @@ -30,21 +30,12 @@ if (stat (path, &statbuf) == 0) { ArgusParseResourceFile (ArgusModel, path); } -@@ -506,7 +506,7 @@ main (int argc, char *argv[]) - if ((status = pthread_attr_init(&attr)) != 0) +@@ -603,7 +603,7 @@ main (int argc, char *argv[]) + if ((status = pthread_attr_init(ArgusAttr)) != 0) ArgusLog (LOG_ERR, "pthreads init error"); - + -#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && !defined(sun) && !defined(CYGWIN) && !defined(OpenBSD) +#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0) && !defined(sun) && !defined(CYGWIN) - if ((status = pthread_attr_getschedpolicy(&attr, &thread_policy)) != 0) + if ((pthread_attr_getschedpolicy(ArgusAttr, &thread_policy)) != 0) ArgusLog (LOG_ERR, "pthreads get policy error"); - if ((status = pthread_attr_getschedparam(&attr, &thread_param)) != 0) -@@ -556,7 +556,7 @@ main (int argc, char *argv[]) - ArgusLog(LOG_WARNING, "started"); - - if (daemonflag) { -- if (getArguspidflag() && ((ArgusPidFile = ArgusCreatePIDFile (ArgusSourceTask, ArgusPidPath, argv[0])) == NULL)) -+ if (getArguspidflag() && ((ArgusPidFile = ArgusCreatePIDFile (ArgusSourceTask, ArgusPidPath, ArgusProgramName)) == NULL)) - ArgusLog (LOG_ERR, "daemon cannot create pid file"); - } - + if ((pthread_attr_getschedparam(ArgusAttr, &thread_param)) != 0) Index: argus/patches/patch-common_argus_util_c =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-common_argus_util_c,v retrieving revision 1.2 diff -u -r1.2 patch-common_argus_util_c --- argus/patches/patch-common_argus_util_c 15 Apr 2010 19:15:19 -0000 1.2 +++ argus/patches/patch-common_argus_util_c 28 Jun 2012 05:48:13 -0000 @@ -1,10 +1,10 @@ -$OpenBSD: patch-common_argus_util_c,v 1.2 2010/04/15 19:15:19 steven Exp $ +$OpenBSD$ work around reading the wrong piece of memory on sparc64. ---- 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) +--- common/argus_util.c.orig Thu Mar 15 06:13:08 2012 ++++ common/argus_util.c Wed Jun 27 22:25:19 2012 +@@ -2084,11 +2084,12 @@ print_time(struct timeval *tvp) char timeZoneBuf[32]; char *retn = ArgusPrintTimeBuf, *ptr; struct tm *tm, tmbuf; Index: argus/patches/patch-man_man5_argus_conf_5 =================================================================== RCS file: argus/patches/patch-man_man5_argus_conf_5 diff -N argus/patches/patch-man_man5_argus_conf_5 --- argus/patches/patch-man_man5_argus_conf_5 11 Nov 2010 19:33:27 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-man_man5_argus_conf_5,v 1.1 2010/11/11 19:33:27 steven Exp $ ---- man/man5/argus.conf.5.orig Thu Nov 11 09:32:21 2010 -+++ man/man5/argus.conf.5 Thu Nov 11 09:32:43 2010 -@@ -4,7 +4,7 @@ - .\" All rights reserved. - .\" - .\" --.TH ARGUS.CONF 1 "07 November 2000" -+.TH ARGUS.CONF 5 "07 November 2000" - .SH NAME - \fBargus.conf\fP \- \fBargus\fP resource file. - .SH SYNOPSIS Index: argus/patches/patch-support_Config_argus_conf =================================================================== RCS file: /cvs/ports/net/argus/patches/patch-support_Config_argus_conf,v retrieving revision 1.2 diff -u -r1.2 patch-support_Config_argus_conf --- argus/patches/patch-support_Config_argus_conf 12 Nov 2010 21:03:45 -0000 1.2 +++ argus/patches/patch-support_Config_argus_conf 28 Jun 2012 05:48:13 -0000 @@ -1,7 +1,15 @@ -$OpenBSD: patch-support_Config_argus_conf,v 1.2 2010/11/12 21:03:45 steven Exp $ ---- support/Config/argus.conf.orig Mon Oct 5 17:22:30 2009 -+++ support/Config/argus.conf Thu Nov 11 12:01:58 2010 -@@ -137,12 +137,12 @@ ARGUS_ACCESS_PORT=561 +$OpenBSD: patch-support_Config_argus_conf,v 1.1 2010/11/11 19:33:27 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" + # + + #ARGUS_DAEMON=no ++ARGUS_DAEMON=yes + + + # Argus Monitor Data is uniquely identifiable based on the source +@@ -211,12 +212,12 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # an HTTP service or DNS service, you'll want to turn # promiscuous mode off. # @@ -15,8 +23,8 @@ +ARGUS_GO_PROMISCUOUS=no - # By default, Argus will provide its own reliable output collection -@@ -186,7 +186,7 @@ ARGUS_ACCESS_PORT=561 + # Argus supports chroot(2) in order to control the file system that +@@ -258,7 +259,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -u # @@ -25,7 +33,7 @@ # Argus can be directed to change its group id using the setgid() system -@@ -199,7 +199,7 @@ ARGUS_ACCESS_PORT=561 +@@ -271,7 +272,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -g # @@ -34,7 +42,7 @@ # Argus can write its output to one or a number of files. -@@ -218,7 +218,7 @@ ARGUS_ACCESS_PORT=561 +@@ -290,7 +291,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # Commandline equivalent -w # @@ -42,13 +50,12 @@ +ARGUS_OUTPUT_FILE=/var/argus/argus.out - # When Argus is configured to run as a daemon, with the -d -@@ -238,7 +238,7 @@ ARGUS_ACCESS_PORT=561 - # No Commandline equivalent + # Argus can push its output to one or a number of remote hosts. +@@ -337,6 +338,7 @@ ARGUS_FLOW_KEY="CLASSIC_5_TUPLE" # --ARGUS_SET_PID=yes + #ARGUS_SET_PID=yes +ARGUS_SET_PID=no - ARGUS_PID_PATH="/var/run" + #ARGUS_PID_PATH="/var/run" Index: argus/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/argus/pkg/PLIST,v retrieving revision 1.4 diff -u -r1.4 PLIST --- argus/pkg/PLIST 11 Nov 2010 19:33:27 -0000 1.4 +++ argus/pkg/PLIST 28 Jun 2012 05:48:13 -0000 @@ -1,6 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.4 2010/11/11 19:33:27 steven Exp $ +@comment $OpenBSD: PLIST,v 1.3 2010/04/15 19:15:19 steven Exp $ @newgroup _argus:603 @newuser _argus:603:_argus:daemon:Argus Daemon:/nonexistent:/sbin/nologin +bin/argus-lsof +bin/argus-snmp +bin/argus-vmstat bin/argusbug @man man/man5/argus.conf.5 @man man/man8/argus.8 @@ -9,6 +12,7 @@ share/doc/argus/README share/examples/argus/ share/examples/argus/Archive/ +share/examples/argus/Archive/README.argusarchive share/examples/argus/Archive/argusarchive share/examples/argus/Config/ share/examples/argus/Config/argus.conf @@ -19,6 +23,8 @@ share/examples/argus/Startup/ share/examples/argus/Startup/README share/examples/argus/Startup/argus +share/examples/argus/Startup/argus.service +share/examples/argus/Startup/com.qosient.argus.plist share/examples/argus/System/ share/examples/argus/System/crontab share/examples/argus/System/magic Index: argus-clients/Makefile =================================================================== RCS file: /cvs/ports/net/argus-clients/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- argus-clients/Makefile 17 May 2012 05:01:35 -0000 1.9 +++ argus-clients/Makefile 28 Jun 2012 05:48:13 -0000 @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2012/05/17 05:01:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2011/12/06 22:31:04 jasper Exp $ COMMENT = utilities to read and parse Argus data -DISTNAME = argus-clients-3.0.2 -REVISION = 1 +DISTNAME = argus-clients-3.0.6 CATEGORIES = net HOMEPAGE = http://qosient.com/argus/ @@ -17,12 +16,15 @@ PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c m ncurses readline +WANTLIB = c m ncurses readline z NO_REGRESS = Yes +LIB_DEPENDS = net/flow-tools + CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += --without-mysql \ +CONFIGURE_ARGS += --with-libft=${LOCALBASE} \ + --without-mysql \ --without-GeoIP \ --without-sasl MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config Index: argus-clients/distinfo =================================================================== RCS file: /cvs/ports/net/argus-clients/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- argus-clients/distinfo 15 Apr 2010 19:16:42 -0000 1.2 +++ argus-clients/distinfo 28 Jun 2012 05:48:13 -0000 @@ -1,5 +1,5 @@ -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 +MD5 (argus-clients-3.0.6.tar.gz) = 9iicvjPreIGKan7vO39WYg== +RMD160 (argus-clients-3.0.6.tar.gz) = dpIw6gsCwt5d2HPPV9ukbs39r0s= +SHA1 (argus-clients-3.0.6.tar.gz) = D2vkjrWCmnbnoErc6+Cfze1dJHo= +SHA256 (argus-clients-3.0.6.tar.gz) = pyOQB/BIxahQAezGZcHYFEIrd2jC+0XlWImTcKllPF0= +SIZE (argus-clients-3.0.6.tar.gz) = 2422254 Index: argus-clients/patches/patch-clients_Makefile_in =================================================================== RCS file: argus-clients/patches/patch-clients_Makefile_in diff -N argus-clients/patches/patch-clients_Makefile_in --- argus-clients/patches/patch-clients_Makefile_in 15 Apr 2010 19:16:42 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-clients_Makefile_in,v 1.2 2010/04/15 19:16:42 steven Exp $ ---- 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 -- $(INSTALL) raports.pl $@ -+ cp raports.pl $@ - - @INSTALL_BIN@/rahosts: rahosts.pl -- $(INSTALL) rahosts.pl $@ -+ cp rahosts.pl $@ - - @INSTALL_BIN@/radark: radark.pl -- $(INSTALL) radark.pl $@ -+ cp radark.pl $@ - - @INSTALL_BIN@/rauserdata: rauserdata.o $(LIB) - $(CC) $(CCOPT) -o $@ rauserdata.o $(LIB) $(COMPATLIB) 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.1 diff -u -r1.1 patch-common_argus_main_c --- argus-clients/patches/patch-common_argus_main_c 17 May 2012 05:01:35 -0000 1.1 +++ argus-clients/patches/patch-common_argus_main_c 28 Jun 2012 05:48:13 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-common_argus_main_c,v 1.1 2012/05/17 05:01:35 ajacoutot Exp $ ---- common/argus_main.c.orig Tue May 15 22:45:33 2012 -+++ common/argus_main.c Tue May 15 22:47:16 2012 -@@ -112,7 +112,7 @@ main (int argc, char **argv) +$OpenBSD$ +--- 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) #if defined(ARGUS_THREADS) int hosts = 0; pthread_attr_t attr; @@ -10,7 +10,7 @@ int thread_policy; struct sched_param thread_param; #if defined(HAVE_SCHED_GET_PRIORITY_MIN) -@@ -136,7 +136,7 @@ main (int argc, char **argv) +@@ -140,7 +140,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.2 diff -u -r1.2 patch-common_argus_util_c --- argus-clients/patches/patch-common_argus_util_c 15 Apr 2010 19:16:42 -0000 1.2 +++ argus-clients/patches/patch-common_argus_util_c 28 Jun 2012 05:48:13 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-common_argus_util_c,v 1.2 2010/04/15 19:16:42 steven Exp $ ---- 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, ...) +$OpenBSD$ +--- 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, ...) *tptr++ = buf[i]; } @@ -11,4 +11,4 @@ + strncpy(buf, tbuf, sizeof(buf)); } - syslog (priority, buf); + syslog (priority, "%s", buf); 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ argus-clients/patches/patch-examples_radump_Makefile_in 28 Jun 2012 05:48:13 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- 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/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/argus-clients/pkg/PLIST,v retrieving revision 1.2 diff -u -r1.2 PLIST --- argus-clients/pkg/PLIST 15 Apr 2010 19:16:42 -0000 1.2 +++ argus-clients/pkg/PLIST 28 Jun 2012 05:48:13 -0000 @@ -1,21 +1,29 @@ -@comment $OpenBSD: PLIST,v 1.2 2010/04/15 19:16:42 steven Exp $ -@comment argus/ +@comment $OpenBSD$ @comment bin/argusbug +@comment argus/ +bin/argusclientbug @bin bin/ra @bin bin/rabins @bin bin/racluster +@bin bin/raconvert @bin bin/racount bin/radark +@bin bin/radium @bin bin/radump +@bin bin/raevent @bin bin/rafilteraddr 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 @bin bin/raservices @bin bin/rasort @bin bin/rasplit @@ -24,21 +32,91 @@ @bin bin/ratemplate @bin bin/ratimerange @bin bin/ratop -@bin bin/ratree @bin bin/rauserdata +include/argus/ +include/argus/argus/ +include/argus/argus/CflowdFlowPdu.h +include/argus/argus/bootp.h +include/argus/argus/cflowd.h +include/argus/argus/cons_def.h +include/argus/argus/cons_out.h +include/argus/argus/extract.h +include/argus/argus/fddi.h +include/argus/argus/gencode.h +include/argus/argus/global.h +include/argus/argus/md5.h +include/argus/argus/ppp.h +include/argus/argus/saslint.h +include/argus/argus/sflow.h +include/argus/argus_8021q.h +include/argus/argus_client.h +include/argus/argus_cluster.h +include/argus/argus_compat.h +include/argus/argus_config.h +include/argus/argus_debug.h +include/argus/argus_def.h +include/argus/argus_dscodepoints.h +include/argus/argus_encapsulations.h +include/argus/argus_ethernames.h +include/argus/argus_ethertype.h +include/argus/argus_event.h +include/argus/argus_filter.h +include/argus/argus_gmpls.h +include/argus/argus_grep.h +include/argus/argus_histo.h +include/argus/argus_int.h +include/argus/argus_isis.h +include/argus/argus_label.h +include/argus/argus_llc.h +include/argus/argus_main.h +include/argus/argus_mdp.h +include/argus/argus_metric.h +include/argus/argus_namedb.h +include/argus/argus_os.h +include/argus/argus_out.h +include/argus/argus_parser.h +include/argus/argus_sort.h +include/argus/argus_udt.h +include/argus/argus_util.h +include/argus/net/ +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/radump.1 +@man man/man1/raevent.1 +@man man/man1/rafilteraddr.1 @man man/man1/ragraph.1 +@man man/man1/ragrep.1 @man man/man1/rahisto.1 +@man man/man1/ralabel.1 @man man/man1/ranonymize.1 +@man man/man1/rapath.1 +@man man/man1/rapolicy.1 @man man/man1/rasort.1 @man man/man1/rasplit.1 +@man man/man1/rasql.1 +@man man/man1/rasqlinsert.1 +@man man/man1/rasqltimeindex.1 @man man/man1/rastream.1 @man man/man1/rastrip.1 @man man/man5/racluster.5 @man man/man5/radium.conf.5 +@man man/man5/ralabel.conf.5 +@man man/man5/ranonymize.5 @man man/man5/rarc.5 @man man/man8/radium.8 @bin sbin/radium @@ -47,53 +125,38 @@ share/argus/delegated-ipv4-latest @comment share/argus/lib/ @comment share/argus/rarc +share/argus/wireshark.manuf.txt 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/README 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/rarc.print.all.conf share/examples/argus-clients/Config/rastream.sh share/examples/argus-clients/Config/std.sig +share/examples/argus-clients/Config/wireshark.manuf.txt +share/examples/argus-clients/Database/ +share/examples/argus-clients/Database/MySQL.Archive.sh +share/examples/argus-clients/Database/README share/examples/argus-clients/Startup/ +share/examples/argus-clients/Startup/README +share/examples/argus-clients/Startup/com.qosient.radium.plist +share/examples/argus-clients/Startup/com.qosient.rasplit.plist share/examples/argus-clients/Startup/radium +share/examples/argus-clients/Startup/radium.service +share/examples/argus-clients/Startup/rasplit share/examples/argus-clients/System/ share/examples/argus-clients/System/magic -share/examples/argus-clients/System/protocols
