aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorse <se@FreeBSD.org>2001-06-02 19:39:51 +0800
committerse <se@FreeBSD.org>2001-06-02 19:39:51 +0800
commitbb9085de2a04ff004354fb0dc7bc40e76124496c (patch)
treecccc766ae35540d00d88c243b4f57276f1ec5772 /net
parentd811eda123796de04c70dee976404c46da4ab2f8 (diff)
downloadfreebsd-ports-gnome-bb9085de2a04ff004354fb0dc7bc40e76124496c.tar.gz
freebsd-ports-gnome-bb9085de2a04ff004354fb0dc7bc40e76124496c.tar.zst
freebsd-ports-gnome-bb9085de2a04ff004354fb0dc7bc40e76124496c.zip
Update to Argus-2.0.1. This commit closes ports/27562, though it is
not based on the patch offered (I already had prepared diffs more than one week ago, but had no time to perform the commit). I choose to use my patches instead of those from the PR, since they seemed even more correct ;-)
Diffstat (limited to 'net')
-rw-r--r--net/argus/Makefile4
-rw-r--r--net/argus/distinfo4
-rw-r--r--net/argus/files/patch-aa9
-rw-r--r--net/argus/files/patch-ab16
-rw-r--r--net/argus/files/patch-ac29
5 files changed, 4 insertions, 58 deletions
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 1a071d55527e..ceff14b0dc6c 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= argus
-PORTVERSION= 2.0.0
+PORTVERSION= 2.0.1
CATEGORIES= net security
MASTER_SITES= http://qosient.com/argus/src/ \
ftp://qosient.com/pub/argus/src/
@@ -20,7 +20,7 @@ LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
GNU_CONFIGURE= true
CONFIGURE_ARGS= --exec-prefix=${PREFIX} #--without-flex --without-bison
-MAN1= ra.1 racount.1 ragator.1 ramon.1 rasort.1 raxml.1
+MAN1= ra.1 racount.1 ragator.1 rasort.1 raxml.1
MAN5= argus.5 argus.conf.5 rarc.5
MAN8= argus.8
diff --git a/net/argus/distinfo b/net/argus/distinfo
index 66790230be2d..da4e4c226161 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1,2 +1,2 @@
-MD5 (argus-2.0.0.tar.gz) = 1a033f2be15aa919764bda2978a3cf84
-SIZE (argus-2.0.0.tar.gz) = 465960
+MD5 (argus-2.0.1.tar.gz) = b28134860423e54efece9f093132d0be
+SIZE (argus-2.0.1.tar.gz) = 413169
diff --git a/net/argus/files/patch-aa b/net/argus/files/patch-aa
index 4f216582735f..edc4220b6501 100644
--- a/net/argus/files/patch-aa
+++ b/net/argus/files/patch-aa
@@ -43,12 +43,3 @@
$(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(BINDIR)/argusbug
$(INSTALL) -m 0755 $(srcdir)/support/Archive/argusarchive $(BINDIR)/argusarchive
-@@ -176,6 +159,8 @@
- $(MANDEST)/man1/racount.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 \
- $(MANDEST)/man1/ragator.1
-+ $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 \
-+ $(MANDEST)/man1/ramon.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 \
- $(MANDEST)/man1/rasort.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 \
diff --git a/net/argus/files/patch-ab b/net/argus/files/patch-ab
deleted file mode 100644
index 58befc429804..000000000000
--- a/net/argus/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- server/ArgusModeler.c~ Fri Mar 9 16:47:00 2001
-+++ server/ArgusModeler.c Fri Apr 6 17:08:28 2001
-@@ -694,5 +694,5 @@
- if ((vlan = (struct ArgusVlanStruct *) ArgusCalloc (1, sizeof(struct ArgusVlanStruct))) != NULL) {
- vlan->type = ARGUS_VLAN_DSR;
-- vlan->length = sizeof(vlan);
-+ vlan->length = sizeof(*vlan);
- flowstr->VlanDSRBuffer = vlan;
- }
-@@ -1510,4 +1510,6 @@
- #endif
-
-+ bzero ((char *)ArgusThisFlow, sizeof(*ArgusThisFlow));
-+ ArgusThisHash = 0;
- ArgusThisIpHdr = ip;
-
diff --git a/net/argus/files/patch-ac b/net/argus/files/patch-ac
deleted file mode 100644
index b1edf28f5411..000000000000
--- a/net/argus/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- server/ArgusOutput.c~ Thu Mar 15 22:19:42 2001
-+++ server/ArgusOutput.c Fri Apr 6 17:08:28 2001
-@@ -365,5 +365,5 @@
- sigignore(SIGINT);
- sigignore(SIGTERM);
-- sigignore(SIGCHLD);
-+// sigignore(SIGCHLD);
- #else
- (void) signal (SIGPIPE, SIG_IGN);
-@@ -371,9 +371,10 @@
- (void) signal (SIGINT, SIG_IGN);
- (void) signal (SIGTERM, SIG_IGN);
-- (void) signal (SIGCHLD, SIG_IGN);
-+// (void) signal (SIGCHLD, SIG_IGN);
- #endif
-
- (void) signal (SIGUSR1, (void (*)(int)) ArgusUsr1Sig);
- (void) signal (SIGUSR2, (void (*)(int)) ArgusUsr2Sig);
-+ (void) signal (SIGCHLD, (void (*)(int)) ArgusChildExit);
-
- if ((ArgusInputSocket = ArgusNewSocket (lfd)) != NULL) {
-@@ -436,4 +437,7 @@
- }
-
-+ if (ArgusUpdateTime())
-+ ArgusHandleData(NULL, NULL, 0, NULL);
-+
- if ((kill (ArgusParentPid, 0)) < 0) {
- ArgusOutputCleanUp(0);