update to 3.0.6.1
This commit is contained in:
parent
ce3a4663cb
commit
85977dedce
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.14 2012/05/17 07:44:40 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.15 2012/07/08 19:20:58 steven Exp $
|
||||
|
||||
COMMENT = Audit Record Generation and Utilization System
|
||||
|
||||
DISTNAME = argus-3.0.2
|
||||
REVISION = 6
|
||||
DISTNAME = argus-3.0.6.1
|
||||
CATEGORIES = net
|
||||
|
||||
HOMEPAGE = http://qosient.com/argus/
|
||||
@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM = Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB = c m pcap
|
||||
WANTLIB = c m pcap z
|
||||
|
||||
USE_GROFF = Yes
|
||||
NO_REGRESS = Yes
|
||||
@ -26,15 +25,17 @@ CONFIGURE_STYLE = gnu
|
||||
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config
|
||||
BUILD_DEPENDS = devel/bison
|
||||
|
||||
MAKE_FLAGS = CCOPT=
|
||||
MAKE_FLAGS = CCOPT="${CFLAGS}"
|
||||
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/
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/argus/events
|
||||
find ${WRKSRC}/support -type f -name '*.orig' -exec rm -f {} \;
|
||||
cd ${WRKSRC}/support && tar cf - . | \
|
||||
tar -C ${PREFIX}/share/examples/argus/ -xf -
|
||||
cd ${PREFIX}/bin && mv argus-snmp argus-lsof argus-vmstat \
|
||||
${PREFIX}/share/examples/argus/events
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -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.1.tar.gz) = huXGVuC40dzb/p8T32QLnQ==
|
||||
RMD160 (argus-3.0.6.1.tar.gz) = xLMODiSWF6LbY4fhn9Z6vVp9AfE=
|
||||
SHA1 (argus-3.0.6.1.tar.gz) = DaGTlXUQ++G3KHXU6iBUU8t4Ib4=
|
||||
SHA256 (argus-3.0.6.1.tar.gz) = 7ZkdjhI5Sk89Sa3wB/grr+YV3k/YNviMhtl/50acrRI=
|
||||
SIZE (argus-3.0.6.1.tar.gz) = 847095
|
||||
|
@ -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: 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
|
||||
@@ -34,7 +34,7 @@ prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datarootdir = @datarootdir@
|
||||
@ -19,9 +19,9 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/04/15 19:15:19 steven Exp $
|
||||
- [ -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 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/04/15 19:15:19 steven Exp $
|
||||
|
||||
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)\
|
||||
|
@ -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: patch-argus_Makefile_in,v 1.2 2012/07/08 19:20:58 steven Exp $
|
||||
--- 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 @@ $OpenBSD: patch-argus_Makefile_in,v 1.1 2011/09/10 11:55:26 naddy Exp $
|
||||
|
||||
# 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@
|
||||
|
||||
|
||||
|
@ -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.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[])
|
||||
uflag = 0;
|
||||
pflag = 6;
|
||||
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-argus_argus_c,v 1.2 2012/05/17 05:01:35 ajacoutot Exp $
|
||||
|
||||
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 @@ $OpenBSD: patch-argus_argus_c,v 1.2 2012/05/17 05:01:35 ajacoutot Exp $
|
||||
|
||||
- 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 @@ $OpenBSD: patch-argus_argus_c,v 1.2 2012/05/17 05:01:35 ajacoutot Exp $
|
||||
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)
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-common_argus_util_c,v 1.2 2010/04/15 19:15:19 steven Exp $
|
||||
$OpenBSD: patch-common_argus_util_c,v 1.3 2012/07/08 19:20:58 steven Exp $
|
||||
|
||||
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;
|
||||
|
@ -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
|
@ -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.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"
|
||||
#
|
||||
|
||||
#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 @@ $OpenBSD: patch-support_Config_argus_conf,v 1.2 2010/11/12 21:03:45 steven Exp $
|
||||
+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 @@ $OpenBSD: patch-support_Config_argus_conf,v 1.2 2010/11/12 21:03:45 steven Exp $
|
||||
|
||||
|
||||
# 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 @@ $OpenBSD: patch-support_Config_argus_conf,v 1.2 2010/11/12 21:03:45 steven Exp $
|
||||
|
||||
|
||||
# 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 @@ $OpenBSD: patch-support_Config_argus_conf,v 1.2 2010/11/12 21:03:45 steven Exp $
|
||||
+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"
|
||||
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.4 2010/11/11 19:33:27 steven Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.5 2012/07/08 19:20:58 steven Exp $
|
||||
@newgroup _argus:603
|
||||
@newuser _argus:603:_argus:daemon:Argus Daemon:/nonexistent:/sbin/nologin
|
||||
bin/argusbug
|
||||
@ -9,6 +9,7 @@ share/doc/argus/
|
||||
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,9 +20,15 @@ share/examples/argus/README
|
||||
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
|
||||
share/examples/argus/events/
|
||||
share/examples/argus/events/argus-lsof
|
||||
share/examples/argus/events/argus-snmp
|
||||
share/examples/argus/events/argus-vmstat
|
||||
@mode 770
|
||||
@owner _argus
|
||||
@group _argus
|
||||
|
Loading…
x
Reference in New Issue
Block a user