update to 3.0.6.2

This commit is contained in:
steven 2012-07-08 19:24:18 +00:00
parent 85977dedce
commit 711ecb45f5
7 changed files with 128 additions and 70 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2012/05/17 05:01:35 ajacoutot 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.2
REVISION = 1
DISTNAME = argus-clients-3.0.6.2
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/
@ -17,12 +16,15 @@ PERMIT_PACKAGE_FTP = Yes
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

View File

@ -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.2.tar.gz) = G6OVfB0FKsJOGLzqWlKvXw==
RMD160 (argus-clients-3.0.6.2.tar.gz) = x8D5yFVtPxnActsxQhMnFeLdAhc=
SHA1 (argus-clients-3.0.6.2.tar.gz) = J6Jl58PPbxH5ksFGmO5QEjoBCR8=
SHA256 (argus-clients-3.0.6.2.tar.gz) = 9R18jRj6Ijbz/jcm3rPAuDCMCmynZ8YImBGWPalTMPw=
SIZE (argus-clients-3.0.6.2.tar.gz) = 2426454

View File

@ -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)

View File

@ -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: 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)
#if defined(ARGUS_THREADS)
int hosts = 0;
pthread_attr_t attr;
@ -10,7 +10,7 @@ $OpenBSD: patch-common_argus_main_c,v 1.1 2012/05/17 05:01:35 ajacoutot Exp $
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");

View File

@ -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: 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, ...)
*tptr++ = buf[i];
}
@ -11,4 +11,4 @@ $OpenBSD: patch-common_argus_util_c,v 1.2 2010/04/15 19:16:42 steven Exp $
+ strncpy(buf, tbuf, sizeof(buf));
}
syslog (priority, buf);
syslog (priority, "%s", buf);

View File

@ -0,0 +1,12 @@
$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)

View File

@ -1,21 +1,29 @@
@comment $OpenBSD: PLIST,v 1.2 2010/04/15 19:16:42 steven Exp $
@comment argus/
@comment $OpenBSD: PLIST,v 1.3 2012/07/08 19:24:18 steven Exp $
@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,92 @@ bin/raports
@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/etherdefs.h
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 +126,38 @@ share/argus/
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