mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
2013-02-05 net-mgmt/argus: Using of this branch of argus is discouraged. Please migrate to net-mgmt/argus3
2013-02-05 net-mgmt/argus-clients: Using of this branch of argus-clients is discouraged. Please migrate to net-mgmt/argus3-clients
This commit is contained in:
Baptiste Daroussin
parent
6891214ff2
commit
c5007b1dde
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=311667
2
MOVED
2
MOVED
@ -4043,3 +4043,5 @@ irc/zircon||2013-02-04|Has expired: Project has been abandoned
|
||||
math/lensnns||2013-02-04|Has expired: Project has been abandoned
|
||||
lang/perl5.8||2013-02-04|Has expired: no longer under development, use lang/perl5.16 or lang/perl5.14
|
||||
lang/perl5.10||2013-02-04|Has expired: no longer under development, use lang/perl5.16 or lang/perl5.14
|
||||
net-mgmt/argus||2013-02-05|Has expired: Using of this branch of argus is discouraged. Please migrate to net-mgmt/argus3
|
||||
net-mgmt/argus-clients||2013-02-05|Has expired: Using of this branch of argus-clients is discouraged. Please migrate to net-mgmt/argus3-clients
|
||||
|
||||
@ -10,8 +10,6 @@
|
||||
SUBDIR += airport
|
||||
SUBDIR += angst
|
||||
SUBDIR += ap-utils
|
||||
SUBDIR += argus
|
||||
SUBDIR += argus-clients
|
||||
SUBDIR += argus-monitor
|
||||
SUBDIR += argus3
|
||||
SUBDIR += argus3-clients
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
# New ports collection makefile for: argus-clients
|
||||
# Date created: 24 March 2004
|
||||
# Whom: Stefan Esser <se@FreeBSD.org>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= argus-clients
|
||||
PORTVERSION= 2.0.6
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= net-mgmt security
|
||||
MASTER_SITES= http://qosient.com/argus/src/ \
|
||||
ftp://qosient.com/pub/argus/src/
|
||||
|
||||
MAINTAINER= 5u623l20@gmail.com
|
||||
COMMENT= Client programs for the argus IP network transaction auditing tool
|
||||
|
||||
DEPRECATED= Using of this branch of argus-clients is discouraged. Please migrate to net-mgmt/argus3-clients
|
||||
EXPIRATION_DATE=2013-02-05
|
||||
|
||||
PORTSCOUT= ignore:1 # This is the last version of 2.0.x branch
|
||||
|
||||
CONFLICTS= argus-clients-3* argus-clients-sasl-3*
|
||||
|
||||
.if defined(WITH_SASL)
|
||||
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
|
||||
.endif
|
||||
|
||||
USE_BISON= build
|
||||
GNU_CONFIGURE= true
|
||||
CONFIGURE_ARGS= --exec-prefix=${PREFIX}
|
||||
.if defined(WITH_SASL)
|
||||
CONFIGURE_ARGS+= --with-sasl=${PREFIX}
|
||||
CFLAGS+= -I${PREFIX}/include/sasl
|
||||
.endif
|
||||
|
||||
DOCSDIR?= ${PREFIX}/share/doc/argus-2.0
|
||||
EXAMPLESDIR?= ${PREFIX}/share/examples/argus-2.0
|
||||
|
||||
MAN1= ra.1 racount.1 ragator.1 rahosts.1 ramon.1 ranonymize.1 rapolicy.1 \
|
||||
rasort.1 rastrip.1 raxml.1
|
||||
MAN5= rarc.5
|
||||
|
||||
do-install:
|
||||
.for i in ra racount ragator ragrep rahistogram rahosts \
|
||||
ramon ranonymize rapath rapolicy rarpwatch raseq \
|
||||
rasort rasrvstats rastrip ratop raxml
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
|
||||
.endfor
|
||||
.for i in argusbug ragraph
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
|
||||
.endfor
|
||||
.for i in argus_client.a argus_common.a argus_parse.a
|
||||
${INSTALL_DATA} ${WRKSRC}/lib/$i ${PREFIX}/lib/$i
|
||||
.endfor
|
||||
${MKDIR} ${PREFIX}/argus/archive
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/argus
|
||||
${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/argus
|
||||
${MKDIR} ${PREFIX}/include
|
||||
${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${PREFIX}/include
|
||||
${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include
|
||||
${MKDIR} ${EXAMPLESDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/support/README ${EXAMPLESDIR}
|
||||
.for i in Archive Config System Tools Xml
|
||||
${MKDIR} ${EXAMPLESDIR}/$i
|
||||
${INSTALL_DATA} ${WRKSRC}/support/$i/* ${EXAMPLESDIR}/$i
|
||||
.endfor
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${DOCSDIR}/html/man
|
||||
.for i in README COPYING CREDITS doc/CHANGES doc/FAQ doc/HOW-TO
|
||||
${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
|
||||
.endfor
|
||||
.for i in hosts_access.5.html hosts_options.5.html ra.1.html \
|
||||
racount.1.html ragator.1.html ramon.1.html rarc.5.html \
|
||||
rasort.1.html raxml.1.html tcpd.8.html tcpdump.1.html
|
||||
${INSTALL_DATA} ${WRKSRC}/doc/html/man/$i ${DOCSDIR}/html/man
|
||||
.endfor
|
||||
.endif
|
||||
.if !defined(NOMAN)
|
||||
.for i in ${MAN1}
|
||||
${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1
|
||||
.endfor
|
||||
.for i in ${MAN5}
|
||||
${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (argus-clients-2.0.6.tar.gz) = 490b7b690d134169579a4f4f20038bad1c113e7a30e030c5d632ce917bd5b6ac
|
||||
SIZE (argus-clients-2.0.6.tar.gz) = 691629
|
||||
@ -1,189 +0,0 @@
|
||||
diff -u3 -r ./ChangeLog /tmp/1/argus-clients-2.0.6.fixes.1/ChangeLog
|
||||
--- ./ChangeLog Fri Dec 5 17:46:00 2003
|
||||
+++ /tmp/1/argus-clients-2.0.6.fixes.1/ChangeLog Mon May 10 19:12:28 2004
|
||||
@@ -1,3 +1,8 @@
|
||||
+Mon May 10 13:11:35 EDT 2004
|
||||
+ argus-clients-2.0.6.fixes.1
|
||||
+ Modified RaAutoCorrection to be off by default (fixes ragator).
|
||||
+ Turned off reporting ArgusAgrStruct in raxml().
|
||||
+
|
||||
Fri Dec 5 11:43:08 EST 2003
|
||||
argus-clients-2.0.6
|
||||
Minor modification for compat.h and BSD.
|
||||
diff -u3 -r ./MANIFEST /tmp/1/argus-clients-2.0.6.fixes.1/MANIFEST
|
||||
--- ./MANIFEST Thu May 6 15:39:48 2004
|
||||
+++ /tmp/1/argus-clients-2.0.6.fixes.1/MANIFEST Mon May 10 19:12:55 2004
|
||||
@@ -21,10 +21,10 @@
|
||||
|
||||
Argus Clients distribution.
|
||||
.:
|
||||
-total 332
|
||||
+total 328
|
||||
-rw-rw-r-- 1 argus argus 17992 Jun 4 2001 COPYING
|
||||
-rw-rw-r-- 1 argus argus 764 Mar 24 2003 CREDITS
|
||||
--rw-rw-r-- 1 argus argus 16161 Dec 5 11:46 ChangeLog
|
||||
+-rw-rw-r-- 1 argus argus 16346 May 10 13:12 ChangeLog
|
||||
-rw-rw-r-- 1 argus argus 6669 Mar 26 2003 INSTALL
|
||||
-rw-rw-r-- 1 argus argus 16245 May 6 09:39 MANIFEST
|
||||
-rw-rw-r-- 1 argus argus 6096 Jul 10 2003 Makefile.in
|
||||
@@ -33,18 +33,18 @@
|
||||
-rw-rw-r-- 1 argus argus 14644 May 6 09:39 aclocal.m4
|
||||
-rwxrwxr-x 1 argus argus 173518 May 6 09:39 configure
|
||||
-rw-rw-r-- 1 argus argus 2240 Oct 24 2002 configure.in
|
||||
-drwxrwxr-x 3 argus argus 4096 May 6 09:34 bin
|
||||
-drwxrwxr-x 3 argus argus 4096 May 6 09:34 clients
|
||||
-drwxrwxr-x 3 argus argus 4096 May 6 09:34 common
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 13:12 bin
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 13:12 clients
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 13:12 common
|
||||
drwxrwxr-x 3 argus argus 4096 Dec 5 21:49 config
|
||||
drwxrwxr-x 5 argus argus 4096 Dec 5 21:49 contrib
|
||||
drwxrwxr-x 4 argus argus 4096 Dec 5 21:49 doc
|
||||
-drwxrwxr-x 5 argus argus 4096 Jan 13 17:40 include
|
||||
-drwxrwxr-x 3 argus argus 4096 May 6 09:34 lib
|
||||
+drwxrwxr-x 5 argus argus 4096 May 10 11:40 include
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 13:12 lib
|
||||
drwxrwxr-x 6 argus argus 4096 Dec 5 21:49 man
|
||||
-drwxrwxr-x 3 argus argus 4096 May 6 09:34 ragraph
|
||||
-drwxrwxr-x 4 argus argus 4096 May 6 09:34 ragrep
|
||||
-drwxrwxr-x 3 argus argus 4096 May 6 09:34 ratop
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 13:12 ragraph
|
||||
+drwxrwxr-x 4 argus argus 4096 May 10 13:12 ragrep
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 13:12 ratop
|
||||
drwxrwxr-x 8 argus argus 4096 Dec 5 21:49 support
|
||||
|
||||
./bin:
|
||||
@@ -80,13 +80,13 @@
|
||||
-rw-rw-r-- 1 argus argus 15501 Mar 27 2003 rastrip.c
|
||||
-rw-rw-r-- 1 argus argus 1375 Mar 26 2003 rastrip.h
|
||||
-rw-rw-r-- 1 argus argus 8090 Mar 27 2003 ratemplate.c
|
||||
--rw-rw-r-- 1 argus argus 35052 Mar 27 2003 raxml.c
|
||||
+-rw-rw-r-- 1 argus argus 35058 May 10 11:46 raxml.c
|
||||
|
||||
./common:
|
||||
total 636
|
||||
-rwxrwxr-x 1 argus argus 4517 Jul 10 2003 Makefile.in
|
||||
-rw-rw-r-- 1 argus argus 16122 Dec 6 12:47 argus_auth.c
|
||||
--rw-rw-r-- 1 argus argus 137243 Mar 27 2003 argus_client.c
|
||||
+-rw-rw-r-- 1 argus argus 137439 May 10 09:41 argus_client.c
|
||||
-rw-rw-r-- 1 argus argus 134325 Mar 26 2003 argus_filter.c
|
||||
-rw-rw-r-- 1 argus argus 143199 Dec 6 12:42 argus_parse.c
|
||||
-rw-rw-r-- 1 argus argus 110901 Dec 6 12:43 argus_util.c
|
||||
@@ -203,7 +203,7 @@
|
||||
total 284
|
||||
-rw-rw-r-- 1 argus argus 17956 Oct 9 2002 CflowdFlowPdu.h
|
||||
-rw-rw-r-- 1 argus argus 4036 Mar 26 2003 argus-namedb.h
|
||||
--rw-rw-r-- 1 argus argus 42631 Jan 13 17:40 argus_client.h
|
||||
+-rw-rw-r-- 1 argus argus 42631 May 10 11:40 argus_client.h
|
||||
-rw-rw-r-- 1 argus argus 11614 Mar 26 2003 argus_def.h
|
||||
-rw-rw-r-- 1 argus argus 8082 Mar 26 2003 argus_filter.h
|
||||
-rw-rw-r-- 1 argus argus 9203 Mar 26 2003 argus_out.h
|
||||
@@ -313,7 +313,7 @@
|
||||
total 24
|
||||
-rw-rw-r-- 1 argus argus 2569 Mar 26 2003 README
|
||||
drwxrwxr-x 3 argus argus 4096 Dec 5 21:49 Archive
|
||||
-drwxrwxr-x 3 argus argus 4096 Dec 5 21:49 Config
|
||||
+drwxrwxr-x 3 argus argus 4096 May 10 09:39 Config
|
||||
drwxrwxr-x 3 argus argus 4096 Dec 5 21:49 System
|
||||
drwxrwxr-x 3 argus argus 4096 Dec 5 21:49 Tools
|
||||
drwxrwxr-x 3 argus argus 4096 Dec 5 21:49 Xml
|
||||
diff -u3 -r ./VERSION /tmp/1/argus-clients-2.0.6.fixes.1/VERSION
|
||||
--- ./VERSION Fri Dec 5 17:46:42 2003
|
||||
+++ /tmp/1/argus-clients-2.0.6.fixes.1/VERSION Mon May 10 19:13:02 2004
|
||||
@@ -1 +1 @@
|
||||
-2.0.6
|
||||
+2.0.6.fixes.1
|
||||
diff -u3 -r ./clients/raxml.c /tmp/1/argus-clients-2.0.6.fixes.1/clients/raxml.c
|
||||
--- ./clients/raxml.c Thu Mar 27 15:55:39 2003
|
||||
+++ /tmp/1/argus-clients-2.0.6.fixes.1/clients/raxml.c Mon May 10 17:46:16 2004
|
||||
@@ -430,7 +430,9 @@
|
||||
RaXMLPrintMetricsData(argus);
|
||||
RaXMLPrintTimeData(argus);
|
||||
RaXMLPrintUsrData(argus);
|
||||
+/*
|
||||
RaXMLPrintAgrData (argus);
|
||||
+*/
|
||||
}
|
||||
|
||||
#if defined(__OpenBSD__)
|
||||
diff -u3 -r ./common/argus_client.c /tmp/1/argus-clients-2.0.6.fixes.1/common/argus_client.c
|
||||
--- ./common/argus_client.c Thu Mar 27 15:55:39 2003
|
||||
+++ /tmp/1/argus-clients-2.0.6.fixes.1/common/argus_client.c Mon May 10 15:41:34 2004
|
||||
@@ -2174,6 +2174,7 @@
|
||||
}
|
||||
|
||||
|
||||
+int RaParseProtoField = 1;
|
||||
struct RaPolicyStruct *
|
||||
RaParsePolicyEntry (char *str)
|
||||
{
|
||||
@@ -2249,32 +2250,35 @@
|
||||
break;
|
||||
|
||||
case RA_POLICYPROTO:
|
||||
- switch (type) {
|
||||
- case RA_FLOWLIST:
|
||||
- if (isdigit((int)*ptr)) {
|
||||
- retn->proto = atoi(ptr);
|
||||
- } else {
|
||||
- if (*ptr == '*') {
|
||||
- retn->proto = 0xFF;
|
||||
+ if (RaParseProtoField) {
|
||||
+ switch (type) {
|
||||
+ case RA_FLOWLIST:
|
||||
+ if (isdigit((int)*ptr)) {
|
||||
+ retn->proto = atoi(ptr);
|
||||
} else {
|
||||
- struct protoent *proto;
|
||||
- if ((proto = getprotobyname(ptr)) != NULL)
|
||||
- retn->proto = proto->p_proto;
|
||||
- else
|
||||
- error++;
|
||||
+ if (*ptr == '*') {
|
||||
+ retn->proto = 0xFF;
|
||||
+ } else {
|
||||
+ struct protoent *proto;
|
||||
+ if ((proto = getprotobyname(ptr)) != NULL)
|
||||
+ retn->proto = proto->p_proto;
|
||||
+ else {
|
||||
+ error++;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
- }
|
||||
- break;
|
||||
+ break;
|
||||
|
||||
- case RA_MODELIST:
|
||||
- if ((strstr(ptr, "yes")) != NULL)
|
||||
- retn->proto = 0xFF;
|
||||
- else
|
||||
- if ((strstr(ptr, "no")) != NULL)
|
||||
- retn->proto = 0x00;
|
||||
+ case RA_MODELIST:
|
||||
+ if ((strstr(ptr, "yes")) != NULL)
|
||||
+ retn->proto = 0xFF;
|
||||
else
|
||||
- error++;
|
||||
- break;
|
||||
+ if ((strstr(ptr, "no")) != NULL)
|
||||
+ retn->proto = 0x00;
|
||||
+ else
|
||||
+ error++;
|
||||
+ break;
|
||||
+ }
|
||||
}
|
||||
break;
|
||||
|
||||
diff -u3 -r ./include/argus_client.h /tmp/1/argus-clients-2.0.6.fixes.1/include/argus_client.h
|
||||
--- ./include/argus_client.h Tue Jan 13 23:40:11 2004
|
||||
+++ /tmp/1/argus-clients-2.0.6.fixes.1/include/argus_client.h Mon May 10 17:40:32 2004
|
||||
@@ -285,7 +285,7 @@
|
||||
int RaCumulativeMerge = 1;
|
||||
int RaPrintActualValues = 1;
|
||||
int RaReportAggregation = 1;
|
||||
-int RaAutoCorrection = 1;
|
||||
+int RaAutoCorrection = 0;
|
||||
|
||||
int RaAllocHashTableHeaders = 0;
|
||||
int RaAllocArgusRecordStore = 0;
|
||||
@ -1,11 +0,0 @@
|
||||
--- common/gencode.c~ Mon Apr 26 18:30:23 2004
|
||||
+++ common/gencode.c Sat Dec 16 15:40:07 2006
|
||||
@@ -232,7 +232,7 @@
|
||||
#include <signal.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
-static u_int ArgusNetMask;
|
||||
+u_int ArgusNetMask;
|
||||
static int snaplen;
|
||||
|
||||
int
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure~ Sat May 15 23:07:07 2004
|
||||
+++ configure Sat May 15 23:08:40 2004
|
||||
@@ -4025,7 +4025,7 @@
|
||||
|
||||
if test -d ${with_sasl}; then
|
||||
ac_cv_sasl_where_lib=${with_sasl}/lib
|
||||
- ac_cv_sasl_where_inc=${with_sasl}/include
|
||||
+ ac_cv_sasl_where_inc=${with_sasl}/include/sasl
|
||||
|
||||
SASLFLAGS="-I$ac_cv_sasl_where_inc"
|
||||
LIB_SASL="-L$ac_cv_sasl_where_lib"
|
||||
@ -1,15 +0,0 @@
|
||||
Client programs that read, parse and process Argus data, and comprise
|
||||
the client part of the Audit Record Generation and Utilization System.
|
||||
|
||||
Argus is a generic IP network transaction auditing tool that has been used
|
||||
by thousands of sites to perform a number of powerful network management
|
||||
tasks that are currently not possible using commercial network management
|
||||
tools.
|
||||
|
||||
Argus runs as an application level daemon, promiscuously reading network
|
||||
datagrams from a specified interface, and generates network traffic audit
|
||||
records for the network activity that it encounters. It is the way that
|
||||
Argus categorizes and reports on network activity that makes this tool
|
||||
unique and powerful.
|
||||
|
||||
WWW: http://www.qosient.com/argus/
|
||||
@ -1,72 +0,0 @@
|
||||
argus/COPYING
|
||||
argus/README
|
||||
bin/argusbug
|
||||
bin/ra
|
||||
bin/racount
|
||||
bin/ragator
|
||||
bin/ragraph
|
||||
bin/ragrep
|
||||
bin/rahistogram
|
||||
bin/rahosts
|
||||
bin/ramon
|
||||
bin/ranonymize
|
||||
bin/rapath
|
||||
bin/rapolicy
|
||||
bin/rarpwatch
|
||||
bin/raseq
|
||||
bin/rasort
|
||||
bin/rasrvstats
|
||||
bin/rastrip
|
||||
bin/ratop
|
||||
bin/raxml
|
||||
include/cons_def.h
|
||||
include/cons_out.h
|
||||
lib/argus_client.a
|
||||
lib/argus_common.a
|
||||
lib/argus_parse.a
|
||||
%%EXAMPLESDIR%%/Archive/argusarchive
|
||||
%%EXAMPLESDIR%%/Config/excel.rc
|
||||
%%EXAMPLESDIR%%/Config/policy.conf
|
||||
%%EXAMPLESDIR%%/Config/ragator.conf
|
||||
%%EXAMPLESDIR%%/Config/rarc
|
||||
%%EXAMPLESDIR%%/README
|
||||
%%EXAMPLESDIR%%/System/crontab
|
||||
%%EXAMPLESDIR%%/System/magic
|
||||
%%EXAMPLESDIR%%/Tools/ArgusPortNum.dat
|
||||
%%EXAMPLESDIR%%/Tools/Makefile
|
||||
%%EXAMPLESDIR%%/Tools/parsePortNum.c
|
||||
%%EXAMPLESDIR%%/Xml/ArgusRecord.biz
|
||||
%%EXAMPLESDIR%%/Xml/ArgusRecord.dtd
|
||||
%%EXAMPLESDIR%%/Xml/ArgusRecord.sox
|
||||
%%EXAMPLESDIR%%/Xml/ArgusRecord.xdr
|
||||
%%EXAMPLESDIR%%/Xml/ArgusRecord.xsd
|
||||
%%EXAMPLESDIR%%/Xml/ArgusRecordSample.xml
|
||||
%%EXAMPLESDIR%%/Xml/README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
|
||||
%%PORTDOCS%%%%DOCSDIR%%/COPYING
|
||||
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/FAQ
|
||||
%%PORTDOCS%%%%DOCSDIR%%/HOW-TO
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/hosts_access.5.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/hosts_options.5.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/ra.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/racount.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/ragator.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/ramon.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/rarc.5.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/rasort.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/raxml.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/tcpd.8.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/html/man/tcpdump.1.html
|
||||
@dirrm %%EXAMPLESDIR%%/Xml
|
||||
@dirrm %%EXAMPLESDIR%%/Tools
|
||||
@dirrm %%EXAMPLESDIR%%/System
|
||||
@dirrm %%EXAMPLESDIR%%/Config
|
||||
@dirrm %%EXAMPLESDIR%%/Archive
|
||||
@dirrm %%EXAMPLESDIR%%
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/man
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
|
||||
%%PORTDOCS%%@dirrm %%DOCSDIR%%
|
||||
@dirrmtry argus/archive
|
||||
@dirrmtry argus
|
||||
@ -1,61 +0,0 @@
|
||||
# New ports collection makefile for: argus
|
||||
# Date created: 26 November 1998
|
||||
# Whom: Jonathan Hanna <jhanna@home.com>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
PORTNAME= argus
|
||||
PORTVERSION= 2.0.6
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= net-mgmt security
|
||||
MASTER_SITES= http://qosient.com/argus/src/ \
|
||||
ftp://qosient.com/pub/argus/src/
|
||||
|
||||
MAINTAINER= 5u623l20@gmail.com
|
||||
COMMENT= A generic IP network transaction auditing tool
|
||||
|
||||
|
||||
DEPRECATED= Using of this branch of argus is discouraged. Please migrate to net-mgmt/argus3
|
||||
EXPIRATION_DATE=2013-02-05
|
||||
|
||||
PORTSCOUT= ignore:1 # This is the last version of 2.0.X branch
|
||||
|
||||
CONFLICTS= argus-3* argus-sasl-3*
|
||||
|
||||
.if defined(WITH_SASL)
|
||||
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
|
||||
.endif
|
||||
RUN_DEPENDS= ${LOCALBASE}/bin/ragrep:${PORTSDIR}/net-mgmt/argus-clients
|
||||
|
||||
USE_BISON= build
|
||||
GNU_CONFIGURE= true
|
||||
CONFIGURE_ARGS= --exec-prefix=${PREFIX}
|
||||
.if defined(WITH_SASL)
|
||||
CONFIGURE_ARGS+= --with-sasl=${PREFIX}
|
||||
.endif
|
||||
|
||||
DOCSDIR?= ${PREFIX}/share/doc/argus-2.0
|
||||
|
||||
MAN5= argus.5 argus.conf.5
|
||||
MAN8= argus.8
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/sbin/argus
|
||||
${MKDIR} ${PREFIX}/argus/archive
|
||||
.if !defined(NOPORTDOCS)
|
||||
${MKDIR} ${DOCSDIR}/html/man
|
||||
.for i in doc/html/man/*.html
|
||||
${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}/html/man
|
||||
.endfor
|
||||
.endif
|
||||
.if !defined(NOMAN)
|
||||
.for i in ${MAN5}
|
||||
${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5
|
||||
.endfor
|
||||
.for i in ${MAN8}
|
||||
${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${PREFIX}/man/man8
|
||||
.endfor
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (argus-2.0.6.tar.gz) = 3e626613ba3348fc60af234777b53fc0a0beb88fe43896aac2b1eda9b22a2c88
|
||||
SIZE (argus-2.0.6.tar.gz) = 349299
|
||||
@ -1,520 +0,0 @@
|
||||
diff -u3 -r ./ChangeLog /tmp/1/argus-2.0.6.fixes.1/ChangeLog
|
||||
--- ./ChangeLog Wed May 5 15:15:44 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/ChangeLog Mon May 10 19:09:58 2004
|
||||
@@ -1,3 +1,6 @@
|
||||
+Mon May 10 13:02:46 EDT 2004
|
||||
+ * bug in -F processing fixed.
|
||||
+
|
||||
Wed May 5 09:15:34 EDT 2004
|
||||
* argus-2.0.6 released.
|
||||
|
||||
diff -u3 -r ./VERSION /tmp/1/argus-2.0.6.fixes.1/VERSION
|
||||
--- ./VERSION Wed May 5 15:54:22 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/VERSION Mon May 10 19:10:12 2004
|
||||
@@ -1 +1 @@
|
||||
-2.0.6
|
||||
+2.0.6.fixes.1
|
||||
diff -u3 -r ./aclocal.m4 /tmp/1/argus-2.0.6.fixes.1/aclocal.m4
|
||||
--- ./aclocal.m4 Mon Feb 23 16:00:29 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/aclocal.m4 Mon May 10 14:53:01 2004
|
||||
@@ -322,7 +322,7 @@
|
||||
|
||||
dnl
|
||||
dnl If the file .debug exists:
|
||||
-dnl Add NTAM_DEBUG to the condefs.h file.
|
||||
+dnl Add ARGUS_DEBUG to the condefs.h file.
|
||||
dnl
|
||||
dnl usage:
|
||||
dnl
|
||||
@@ -338,13 +338,13 @@
|
||||
[
|
||||
if test -f .debug ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
-#define NTAMDEBUG 1
|
||||
+#define ARGUSDEBUG 1
|
||||
EOF
|
||||
fi])
|
||||
|
||||
dnl
|
||||
dnl If the file .threads exists:
|
||||
-dnl Add NTAM_THREADS to the condefs.h file.
|
||||
+dnl Add ARGUS_THREADS to the condefs.h file.
|
||||
dnl
|
||||
dnl usage:
|
||||
dnl
|
||||
@@ -360,7 +360,7 @@
|
||||
[
|
||||
if test -f .threads ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
-#define NTAM_THREADS 1
|
||||
+#define ARGUS_THREADS 1
|
||||
EOF
|
||||
if test "$GCC" = yes ; then
|
||||
LIBS="$LIBS -pthread"
|
||||
@@ -451,7 +451,7 @@
|
||||
LIB_SASL="$LIB_SASL -lsasl"
|
||||
|
||||
if test "$with_sasl" != no; then
|
||||
- AC_DEFINE(NTAM_SASL, 1)
|
||||
+ AC_DEFINE(ARGUS_SASL, 1)
|
||||
AC_SUBST(LIB_SASL)
|
||||
AC_SUBST(SASLFLAGS)
|
||||
fi
|
||||
diff -u3 -r ./common/argus_filter.c /tmp/1/argus-2.0.6.fixes.1/common/argus_filter.c
|
||||
--- ./common/argus_filter.c Mon Feb 23 16:00:36 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/common/argus_filter.c Mon May 10 15:29:10 2004
|
||||
@@ -4765,11 +4765,13 @@
|
||||
void
|
||||
ArgusDebug (int d, char *fmt, ...)
|
||||
{
|
||||
- va_list ap;
|
||||
char buf[1024], *ptr;
|
||||
+ struct timeval now;
|
||||
+ va_list ap;
|
||||
|
||||
if (d <= Argusdflag) {
|
||||
- (void) sprintf (buf, "%s[%d]: %s ", ArgusProgramName, (int)getpid(), print_time(&ArgusGlobalTime));
|
||||
+ gettimeofday(&now, 0L);
|
||||
+ (void) sprintf (buf, "%s[%d]: %s ", ArgusProgramName, (int)getpid(), print_time(&now));
|
||||
ptr = &buf[strlen(buf)];
|
||||
|
||||
va_start (ap, fmt);
|
||||
@@ -5480,9 +5482,8 @@
|
||||
ptr = &buf[strlen(buf)];
|
||||
va_end (ap);
|
||||
|
||||
- if (*fmt) {
|
||||
- fmt += (int) strlen (fmt);
|
||||
- if (fmt[-1] != '\n')
|
||||
+ if (*ptr) {
|
||||
+ if (ptr[-1] != '\n')
|
||||
sprintf (ptr, "\n");
|
||||
}
|
||||
|
||||
diff -u3 -r ./configure /tmp/1/argus-2.0.6.fixes.1/configure
|
||||
--- ./configure Wed May 5 16:27:45 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/configure Mon May 10 14:53:56 2004
|
||||
@@ -3901,7 +3901,7 @@
|
||||
|
||||
if test -f .debug ; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
-#define NTAMDEBUG 1
|
||||
+#define ARGUSDEBUG 1
|
||||
EOF
|
||||
fi
|
||||
|
||||
@@ -4376,7 +4376,7 @@
|
||||
|
||||
if test "$with_sasl" != no; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
-#define NTAM_SASL 1
|
||||
+#define ARGUS_SASL 1
|
||||
_ACEOF
|
||||
|
||||
|
||||
diff -u3 -r ./server/ArgusSource.c /tmp/1/argus-2.0.6.fixes.1/server/ArgusSource.c
|
||||
--- ./server/ArgusSource.c Fri Apr 30 20:11:35 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/server/ArgusSource.c Mon May 10 15:23:22 2004
|
||||
@@ -67,7 +67,7 @@
|
||||
ArgusSnapLen = getArgusSnapLen();
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (1, "ArgusNewSource() returning 0x%x\n", retn);
|
||||
+ ArgusDebug (1, "ArgusNewSource() returning 0x%x", retn);
|
||||
#endif
|
||||
|
||||
return (retn);
|
||||
@@ -99,7 +99,7 @@
|
||||
setuid(getuid());
|
||||
|
||||
if ((ArgusPd[0] = ArgusOpenInputPacketFile(errbuf)) == NULL)
|
||||
- ArgusLog (LOG_ERR, "ArgusInitSource: %s\n", errbuf);
|
||||
+ ArgusLog (LOG_ERR, "ArgusInitSource: %s", errbuf);
|
||||
|
||||
} else {
|
||||
if (ArgusDeviceList == NULL) {
|
||||
@@ -127,7 +127,7 @@
|
||||
ArgusInterface[i].ArgusNetMask = ntohl(ArgusInterface[i].ArgusNetMask);
|
||||
}
|
||||
} else
|
||||
- ArgusLog (LOG_ERR, "ArgusInitSource: pcap_open_live %s\n", errbuf);
|
||||
+ ArgusLog (LOG_ERR, "ArgusInitSource: pcap_open_live %s", errbuf);
|
||||
|
||||
ArgusPushBackList(ArgusDeviceList, ArgusDevice);
|
||||
}
|
||||
@@ -154,7 +154,7 @@
|
||||
bzero ((char *) &ArgusFilters[0], sizeof (struct bpf_program));
|
||||
|
||||
if (pcap_compile (ArgusPd[0], &ArgusFilters[0], ArgusInputFilter, getArgusOflag(), ArgusNetMask) < 0)
|
||||
- ArgusLog (LOG_ERR, "ArgusInputFilter \"%s\" %s\n", ArgusInputFilter, pcap_geterr (ArgusPd[0]));
|
||||
+ ArgusLog (LOG_ERR, "ArgusInputFilter \"%s\" %s", ArgusInputFilter, pcap_geterr (ArgusPd[0]));
|
||||
|
||||
if (Argusbpflag) {
|
||||
Argusbpf_dump (&ArgusFilters[0], Argusbpflag);
|
||||
@@ -165,18 +165,18 @@
|
||||
if (ArgusPd[i] != NULL) {
|
||||
if (ArgusInputPacketFileType == ARGUSLIBPPKTFILE) {
|
||||
if (pcap_setfilter (ArgusPd[i], &ArgusFilters[0]) < 0)
|
||||
- ArgusLog (LOG_ERR, "%s\n", pcap_geterr (ArgusPd[i]));
|
||||
+ ArgusLog (LOG_ERR, "%s", pcap_geterr (ArgusPd[i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ArgusWriteOutPacketFile) {
|
||||
if ((ArgusPcapOutFile = pcap_dump_open(ArgusPd[0], ArgusWriteOutPacketFile)) == NULL)
|
||||
- ArgusLog (LOG_ERR, "%s\n", pcap_geterr (ArgusPd[0]));
|
||||
+ ArgusLog (LOG_ERR, "%s", pcap_geterr (ArgusPd[0]));
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (1, "ArgusInitSource() returning\n");
|
||||
+ ArgusDebug (1, "ArgusInitSource() returning");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
pcap_dump_close(ArgusPcapOutFile);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (1, "ArgusDeleteSource() deleting ArgusSourceTask 0x%x\n", ArgusSourceTask);
|
||||
+ ArgusDebug (1, "ArgusDeleteSource() deleting ArgusSourceTask 0x%x", ArgusSourceTask);
|
||||
#endif
|
||||
return (0);
|
||||
}
|
||||
@@ -260,7 +260,7 @@
|
||||
retn = (char *) ArgusFrontList(ArgusDeviceList);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "getArgusDevice() returning %s\n", retn);
|
||||
+ ArgusDebug (3, "getArgusDevice() returning %s", retn);
|
||||
#endif
|
||||
return (retn);
|
||||
}
|
||||
@@ -276,7 +276,7 @@
|
||||
ArgusPushFrontList(ArgusDeviceList, strdup(value));
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "setArgusDevice(%s) returning\n", value);
|
||||
+ ArgusDebug (3, "setArgusDevice(%s) returning", value);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -289,7 +289,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "clearArgusDevice(%s) returning\n");
|
||||
+ ArgusDebug (3, "clearArgusDevice(%s) returning");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -381,7 +381,7 @@
|
||||
close(pcap_fileno(ArgusPd[0]));
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (5, "ArgusMoatTshRead() returning %d\n", retn);
|
||||
+ ArgusDebug (5, "ArgusMoatTshRead() returning %d", retn);
|
||||
#endif
|
||||
|
||||
return (retn);
|
||||
@@ -424,7 +424,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (5, "ArgusSnoopRead() returning %d\n", retn);
|
||||
+ ArgusDebug (5, "ArgusSnoopRead() returning %d", retn);
|
||||
#endif
|
||||
|
||||
return (retn);
|
||||
@@ -449,7 +449,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "Arguslookup_pcap_callback(%d) returning %s: 0x%x\n", type, name, retn);
|
||||
+ ArgusDebug (3, "Arguslookup_pcap_callback(%d) returning %s: 0x%x", type, name, retn);
|
||||
#endif
|
||||
|
||||
return (retn);
|
||||
@@ -489,7 +489,7 @@
|
||||
}
|
||||
|
||||
if ((ArgusPcapOutFile = pcap_dump_open(ArgusPd[0], ArgusWriteOutPacketFile)) == NULL)
|
||||
- ArgusLog (LOG_ERR, "%s\n", pcap_geterr (ArgusPd[0]));
|
||||
+ ArgusLog (LOG_ERR, "%s", pcap_geterr (ArgusPd[0]));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -499,7 +499,7 @@
|
||||
pcap_dump((u_char *)ArgusPcapOutFile, h, p);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusEtherPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusEtherPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -604,7 +604,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
ArgusThisLength = length;
|
||||
@@ -617,7 +617,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -636,7 +636,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusATMPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusATMPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
|
||||
@@ -669,7 +669,7 @@
|
||||
ArgusProcessPacket (ep, length, tvp);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusATMPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusATMPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -688,7 +688,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusPppPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusPppPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
ArgusSnapLength = caplen;
|
||||
@@ -703,7 +703,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -723,7 +723,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusPppBsdosPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusPppBsdosPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
ArgusSnapLength = caplen;
|
||||
@@ -754,7 +754,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -789,7 +789,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
ArgusSnapLength = caplen;
|
||||
@@ -805,7 +805,7 @@
|
||||
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -821,7 +821,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusIpPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusIpPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
ArgusSnapLength = caplen;
|
||||
@@ -835,7 +835,7 @@
|
||||
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusIpPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusIpPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -860,7 +860,7 @@
|
||||
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusSllPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusSllPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
|
||||
user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
|
||||
@@ -911,7 +911,7 @@
|
||||
ArgusProcessPacket (ep, length, tvp);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusSllPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
|
||||
+ ArgusDebug (6, "ArgusSllPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -958,7 +958,7 @@
|
||||
case ARGUSLIBPPKTFILE:
|
||||
if ((pcap_read (ArgusPd[i], -1, ArgusCallBack, (u_char *) NULL)) < 0) {
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (4, "ArgusGetPackets: pcap_read() returned %s\n", pcap_geterr(ArgusPd[i]));
|
||||
+ ArgusDebug (4, "ArgusGetPackets: pcap_read() returned %s", pcap_geterr(ArgusPd[i]));
|
||||
#endif
|
||||
noerror = 0;
|
||||
}
|
||||
@@ -986,7 +986,7 @@
|
||||
gettimeofday (tvp, NULL);
|
||||
ArgusGlobalTime = *tvp;
|
||||
if (ArgusGlobalTime.tv_sec < 0) {
|
||||
- ArgusLog (LOG_ERR, "ArgusGetPackets () gettimeofday() timestamp out of range %d.%d\n",
|
||||
+ ArgusLog (LOG_ERR, "ArgusGetPackets () gettimeofday() timestamp out of range %d.%d",
|
||||
ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
|
||||
}
|
||||
|
||||
@@ -997,7 +997,7 @@
|
||||
FD_ZERO(&ArgusReadMask);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (4, "ArgusGetPackets: select() returned %s\n", strerror(errno));
|
||||
+ ArgusDebug (4, "ArgusGetPackets: select() returned %s", strerror(errno));
|
||||
#endif
|
||||
if (errno == EINTR)
|
||||
break;
|
||||
@@ -1029,7 +1029,7 @@
|
||||
gettimeofday (&ArgusEndTime, 0L);
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (4, "ArgusGetPackets () returning\n");
|
||||
+ ArgusDebug (4, "ArgusGetPackets () returning");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1066,7 +1066,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "Argusbpf_dump (0x%x, %d) returning\n", p, option);
|
||||
+ ArgusDebug (3, "Argusbpf_dump (0x%x, %d) returning", p, option);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1124,7 +1124,7 @@
|
||||
ArgusReadingOffLine++;
|
||||
|
||||
} else
|
||||
- ArgusLog(LOG_ERR, "ArgusOpenInputPacketFile(%s) error. %s\n", Argusrfile, strerror(errno));
|
||||
+ ArgusLog(LOG_ERR, "ArgusOpenInputPacketFile(%s) error. %s", Argusrfile, strerror(errno));
|
||||
} else
|
||||
if ((ch = fgetc(ArgusPacketInput)) != EOF) {
|
||||
ungetc(ch, ArgusPacketInput);
|
||||
@@ -1144,19 +1144,19 @@
|
||||
}
|
||||
|
||||
} else {
|
||||
- snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Unknown packet file format\n");
|
||||
+ snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Unknown packet file format");
|
||||
}
|
||||
} else {
|
||||
- snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Read %d bytes\n", Argusrfile, rlen);
|
||||
+ snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Read %d bytes", Argusrfile, rlen);
|
||||
}
|
||||
} else {
|
||||
- snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Stream Empty\n", Argusrfile);
|
||||
+ snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Stream Empty", Argusrfile);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "ArgusOpenInputPacketFile(0x%x) returning 0x%x\n", errbuf, retn);
|
||||
+ ArgusDebug (3, "ArgusOpenInputPacketFile(0x%x) returning 0x%x", errbuf, retn);
|
||||
#endif
|
||||
|
||||
return (retn);
|
||||
@@ -1189,7 +1189,7 @@
|
||||
}
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (6, "ArgusCopyArgv(0x%x) returning 0x%x\n", argv, buf);
|
||||
+ ArgusDebug (6, "ArgusCopyArgv(0x%x) returning 0x%x", argv, buf);
|
||||
#endif
|
||||
|
||||
return buf;
|
||||
@@ -1210,7 +1210,7 @@
|
||||
|
||||
if ((fd = open(fname, O_RDONLY)) >= 0) {
|
||||
if (fstat(fd, &buf) < 0) {
|
||||
- snprintf (outbuf, 255, "%s: fstat('%s') failed.\n", ArgusProgramName, fname);
|
||||
+ snprintf (outbuf, 255, "%s: fstat('%s') failed.", ArgusProgramName, fname);
|
||||
perror (outbuf);
|
||||
close(fd);
|
||||
}
|
||||
@@ -1233,7 +1233,7 @@
|
||||
|
||||
|
||||
#ifdef ARGUSDEBUG
|
||||
- ArgusDebug (3, "ArgusReadInfile(%s) returning 0x%x\n", fname, p);
|
||||
+ ArgusDebug (3, "ArgusReadInfile(%s) returning 0x%x", fname, p);
|
||||
#endif
|
||||
|
||||
return (p);
|
||||
diff -u3 -r ./server/argus.c /tmp/1/argus-2.0.6.fixes.1/server/argus.c
|
||||
--- ./server/argus.c Mon Feb 23 16:00:36 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/server/argus.c Mon May 10 14:51:57 2004
|
||||
@@ -236,8 +236,16 @@
|
||||
if (*ptr == '-') {
|
||||
do {
|
||||
switch (*++ptr) {
|
||||
+ case 'D':
|
||||
+ if (*++ptr == '\0')
|
||||
+ ptr = argv[++i];
|
||||
+ setArgusdflag (atoi (ptr));
|
||||
+ break;
|
||||
+
|
||||
case 'F':
|
||||
- ArgusParseResourceFile (argv[i++]);
|
||||
+ if (*++ptr == '\0')
|
||||
+ ptr = argv[++i];
|
||||
+ ArgusParseResourceFile (ptr);
|
||||
doconf++;
|
||||
break;
|
||||
|
||||
diff -u3 -r ./server/argus.h /tmp/1/argus-2.0.6.fixes.1/server/argus.h
|
||||
--- ./server/argus.h Mon Feb 23 16:00:36 2004
|
||||
+++ /tmp/1/argus-2.0.6.fixes.1/server/argus.h Mon May 10 15:00:13 2004
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
char *RaTimeFormat = "%d %b %y %T";
|
||||
char RaFieldDelimiter = '.';
|
||||
-int nflag = 1, Nflag = -1, uflag = 1, gflag = 0;
|
||||
+int nflag = 1, Nflag = -1, uflag = 0, gflag = 0;
|
||||
int Uflag = 6, XMLflag = 0, pflag = 0, pidflag = 0;
|
||||
int Dflag = 0, daemonflag = 0;
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
--- Makefile.in~ Tue Apr 13 07:08:28 2004
|
||||
+++ Makefile.in Mon Apr 26 15:14:27 2004
|
||||
@@ -105,25 +105,25 @@
|
||||
|
||||
[ -d @mandir@ ] || \
|
||||
(mkdir -p @mandir@; chmod 755 @mandir@)
|
||||
- [ -d @mandir@/man1 ] || \
|
||||
- (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
|
||||
+# [ -d @mandir@/man1 ] || \
|
||||
+# (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
|
||||
[ -d @mandir@/man5 ] || \
|
||||
(mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
|
||||
[ -d @mandir@/man8 ] || \
|
||||
(mkdir -p @mandir@/man8; chmod 755 @mandir@/man8)
|
||||
$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5
|
||||
$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
|
||||
|
||||
$(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 @mandir@/man8/argus.8
|
||||
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1
|
||||
- $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1
|
||||
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1
|
||||
|
||||
uninstall:
|
||||
rm -f @mandir@/man5/argus.5
|
||||
@ -1,20 +0,0 @@
|
||||
--- common/argus_filter.c~ Sat Sep 16 22:36:56 2006
|
||||
+++ common/argus_filter.c Sat Sep 16 22:38:10 2006
|
||||
@@ -3713,7 +3713,7 @@
|
||||
extern int ether_hostton(char *, struct ether_addr *);
|
||||
#endif
|
||||
|
||||
-#if !defined(HAVE_ETHER_HOSTTON) && !defined(linux) && !defined(CYGWIN) && !defined(__NetBSD__)
|
||||
+#if !defined(HAVE_ETHER_HOSTTON) && !defined(linux) && !defined(CYGWIN) && !defined(__NetBSD__) &&!defined(__FreeBSD__)
|
||||
extern int ether_ntohost(char *, struct ether_addr *);
|
||||
extern int ether_hostton(char *, struct ether_addr *);
|
||||
#endif
|
||||
@@ -4680,7 +4680,7 @@
|
||||
register u_char *ap;
|
||||
u_char a[6];
|
||||
|
||||
-#if !defined(HAVE_ETHER_HOSTTON) && !defined(__NetBSD__)
|
||||
+#if !defined(HAVE_ETHER_HOSTTON) && !defined(__NetBSD__) && !defined(__FreeBSD__)
|
||||
extern int ether_hostton(char *, struct ether_addr *);
|
||||
#endif
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- configure.orig Mon Apr 26 14:39:58 2004
|
||||
+++ configure Mon Apr 26 14:40:16 2004
|
||||
@@ -4163,7 +4163,7 @@
|
||||
|
||||
if test -d ${with_sasl}; then
|
||||
ac_cv_sasl_where_lib=${with_sasl}/lib
|
||||
- ac_cv_sasl_where_inc=${with_sasl}/include
|
||||
+ ac_cv_sasl_where_inc=${with_sasl}/include/sasl
|
||||
|
||||
SASLFLAGS="-I$ac_cv_sasl_where_inc"
|
||||
LIB_SASL="-L$ac_cv_sasl_where_lib"
|
||||
@ -1,12 +0,0 @@
|
||||
Argus is a generic IP network transaction auditing tool that has been used
|
||||
by thousands of sites to perform a number of powerful network management
|
||||
tasks that are currently not possible using commercial network management
|
||||
tools.
|
||||
|
||||
Argus runs as an application level daemon, promiscuously reading network
|
||||
datagrams from a specified interface, and generates network traffic audit
|
||||
records for the network activity that it encounters. It is the way that
|
||||
Argus categorizes and reports on network activity that makes this tool
|
||||
unique and powerful.
|
||||
|
||||
WWW: http://www.qosient.com/argus/
|
||||
@ -1,7 +0,0 @@
|
||||
sbin/argus
|
||||
@exec mkdir -p %D/argus/archive
|
||||
%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.5.html
|
||||
%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.8.html
|
||||
%%PORTDOCS%%share/doc/argus-2.0/html/man/argus.conf.5.html
|
||||
@dirrmtry argus/archive
|
||||
@dirrmtry argus
|
||||
Loading…
Reference in New Issue
Block a user