It seems struct ifnet grew, and the buffer used to kvm_read into wasn't

big enough, resulting into overwriting of stack variables making wmnet
core dump because of segfault. Increase buffer size to avoid that.
Bump to 1.06nb2.

4 files changed, 24 insertions, 10 deletions

diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index aef35f4c64a..d9324ab1e58 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/03/27 02:29:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/30 09:55:57 wiz Exp $
 
 DISTNAME=	wmnet-1.06
-PKGNAME=	${DISTNAME}nb1
+PKGNAME=	${DISTNAME}nb2
 CATEGORIES=	net x11
 MASTER_SITES=	http://www.digitalkaos.net/linux/wmnet/download/
 
diff --git a/net/wmnet/distinfo b/net/wmnet/distinfo
index 3fa51cf3d5a..3be590e7028 100644
--- a/net/wmnet/distinfo
+++ b/net/wmnet/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:40 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/30 09:55:57 wiz Exp $
 
 SHA1 (wmnet-1.06.tar.gz) = 978364e0ab45c71730c196334e8fced4ac0a7853
 Size (wmnet-1.06.tar.gz) = 27506 bytes
 SHA1 (patch-aa) = be4c53294fbdf234f50900f5051d7a48c70e4481
 SHA1 (patch-ab) = 97418adde93c0299fa5cdfdafc435350cf99e22e
-SHA1 (patch-ac) = 13572af7cadcf576d06ae3593faf232ee84f3eb9
+SHA1 (patch-ac) = 9afb6353c121f8d935243d5cd34daa824005d6da
 SHA1 (patch-ad) = b8212251da24d60856f5ff0349a6b6abf732888b
 SHA1 (patch-ae) = bc43be18fc06090bf102ec927ce5c1bd6f9ab953
-SHA1 (patch-af) = eeee640b7a4875cdc2a57bb8121333c7a94925aa
+SHA1 (patch-af) = 70c0917b465acf778b6b744bef587bc8e41e49fb
diff --git a/net/wmnet/patches/patch-ac b/net/wmnet/patches/patch-ac
index 545d7f4a731..72c7efb7234 100644
--- a/net/wmnet/patches/patch-ac
+++ b/net/wmnet/patches/patch-ac
@@ -1,7 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2000/07/31 17:24:22 tron Exp $
+$NetBSD: patch-ac,v 1.3 2001/06/30 09:55:57 wiz Exp $
 
 --- drivers.c.orig	Fri May  5 02:34:29 2000
-+++ drivers.c	Mon Jul 31 19:22:21 2000
++++ drivers.c
+@@ -57,7 +57,7 @@
+ #define ACCOUNT_IN_FOUND        1
+ #define ACCOUNT_OUT_FOUND       2
+ 
+-extern char buffer[256];
++extern char buffer[2048];
+ extern char *in_rule_string, *out_rule_string, *device;
+ extern unsigned long totalbytes_in, totalbytes_out, lastbytes_in, lastbytes_out;
+ extern unsigned long totalpackets_in, totalpackets_out, lastpackets_in, lastpackets_out;
 @@ -445,7 +445,7 @@
    if (((kvmfd = kvm_open(NULL, NULL, NULL, O_RDONLY, buffer)) == NULL) ||
        (kvm_nlist(kvmfd, symbols) < 0) ||
diff --git a/net/wmnet/patches/patch-af b/net/wmnet/patches/patch-af
index 5d0cfd7647c..9a2b64b68bd 100644
--- a/net/wmnet/patches/patch-af
+++ b/net/wmnet/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2001/03/27 02:29:18 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2001/06/30 09:55:57 wiz Exp $
 
---- wmnet.h.orig	Sun Mar  4 02:39:16 2001
+--- wmnet.h.orig	Fri May  5 03:02:26 2000
 +++ wmnet.h
-@@ -68,8 +68,9 @@
+@@ -68,12 +68,13 @@
  Pixmap arrow;
  Atom delete_atom;
  int screen, specified_state = -1;
@@ -13,3 +13,8 @@ $NetBSD: patch-af,v 1.1 2001/03/27 02:29:18 hubertf Exp $
  typedef int (*parser_func)(void);
  
  /* I know statically declared buffers are against GNU coding standards, so sue me */
+-char buffer[256], *click_command = NULL, *label = NULL;
++char buffer[2048], *click_command = NULL, *label = NULL;
+ struct timeval timenow, timelast;
+ unsigned long totalbytes_in, totalbytes_out, lastbytes_in, lastbytes_out;
+ unsigned long totalpackets_in, totalpackets_out, lastpackets_in, lastpackets_out;