Sun Jan 4 20:03:21 2009 UTC ()
Store traffic counters in u_quad_t to avoid overflow.  Closes PR 38168.
Take maintainership.

OK by wiz@.


(shattered)
diff -r1.22 -r1.23 pkgsrc/net/pload/Makefile
diff -r1.7 -r1.8 pkgsrc/net/pload/distinfo
diff -r0 -r1.1 pkgsrc/net/pload/patches/patch-ad
diff -r0 -r1.1 pkgsrc/net/pload/patches/patch-ae
cvs diff -r1.22 -r1.23 pkgsrc/net/pload/Makefile (expand / switch to unified diff)

--- pkgsrc/net/pload/Makefile 2008/11/10 17:21:37 1.22
+++ pkgsrc/net/pload/Makefile 2009/01/04 20:03:21 1.23
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.22 2008/11/10 17:21:37 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2009/01/04 20:03:21 shattered Exp $
2# 2#
3 3
4DISTNAME= pload-0.9.5 4DISTNAME= pload-0.9.5
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= net x11 6CATEGORIES= net x11
7MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/serial/ppp/} 7MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/serial/ppp/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= shattered@NetBSD.org
10HOMEPAGE= http://web.archive.org/web/20050305142516/http://www.engr.utk.edu/~mdsmith/pload/ 10HOMEPAGE= http://web.archive.org/web/20050305142516/http://www.engr.utk.edu/~mdsmith/pload/
11COMMENT= PPP monitor for X11, monitoring totals and current in/out rates 11COMMENT= PPP monitor for X11, monitoring totals and current in/out rates
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15NOT_FOR_BULK_PLATFORM= HPUX-*-* 15NOT_FOR_BULK_PLATFORM= HPUX-*-*
16 16
17HAS_CONFIGURE= YES 17HAS_CONFIGURE= YES
18USE_TOOLS+= imake 18USE_TOOLS+= imake
19USE_X11BASE= YES 19USE_X11BASE= YES
20INSTALL_TARGET= install install.man 20INSTALL_TARGET= install install.man
21 21
22.include "../../x11/libXaw/buildlink3.mk" 22.include "../../x11/libXaw/buildlink3.mk"
cvs diff -r1.7 -r1.8 pkgsrc/net/pload/distinfo (expand / switch to unified diff)

--- pkgsrc/net/pload/distinfo 2007/12/09 23:41:11 1.7
+++ pkgsrc/net/pload/distinfo 2009/01/04 20:03:21 1.8
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.7 2007/12/09 23:41:11 wiz Exp $ 1$NetBSD: distinfo,v 1.8 2009/01/04 20:03:21 shattered Exp $
2 2
3SHA1 (pload-0.9.5.tar.gz) = 52e8ca31ad534cbc131d0bd19ef5ae45b5b37777 3SHA1 (pload-0.9.5.tar.gz) = 52e8ca31ad534cbc131d0bd19ef5ae45b5b37777
4RMD160 (pload-0.9.5.tar.gz) = 48ff961d760430a3a45533f7023b1fefa252ede8 4RMD160 (pload-0.9.5.tar.gz) = 48ff961d760430a3a45533f7023b1fefa252ede8
5Size (pload-0.9.5.tar.gz) = 22423 bytes 5Size (pload-0.9.5.tar.gz) = 22423 bytes
6SHA1 (patch-aa) = 6a30a15c60e74eeb5312e275b1dac882c86b2420 6SHA1 (patch-aa) = 6a30a15c60e74eeb5312e275b1dac882c86b2420
7SHA1 (patch-ab) = 4bf2639b64d20717716c66be85c4fb5cd3b114d5 7SHA1 (patch-ab) = 4bf2639b64d20717716c66be85c4fb5cd3b114d5
8SHA1 (patch-ac) = 345ac88bb5d279039ae0169c2b468b22964a0c09 8SHA1 (patch-ac) = 345ac88bb5d279039ae0169c2b468b22964a0c09
 9SHA1 (patch-ad) = 97e7f37561882098b080683237e661f2f5692025
 10SHA1 (patch-ae) = d98a346e56d36eb5efd084eef1a95ca6c350c0f5
File Added: pkgsrc/net/pload/patches/patch-ad
$NetBSD: patch-ad,v 1.1 2009/01/04 20:03:21 shattered Exp $

--- pload.h.orig	2000-02-01 07:11:24.000000000 +0000
+++ pload.h
@@ -35,10 +35,17 @@ struct if_dat
 #ifdef LINUXPROC
 	FILE *file;				/* /proc/net/dev	*/
 #endif	
+#ifdef __NetBSD__
+	u_quad_t in_bytes;			/* total bytes in 	*/
+	u_quad_t in_bytes_old;			/* last total bytes in	*/
+	u_quad_t out_bytes;			/* total bytes out 	*/
+	u_quad_t out_bytes_old;			/* last total byts out	*/
+#else
 	unsigned long in_bytes;			/* total bytes in 	*/
 	unsigned long in_bytes_old;		/* last total bytes in	*/
 	unsigned long out_bytes;		/* total bytes out 	*/
 	unsigned long out_bytes_old;		/* last total byts out	*/
+#endif
 	struct timeval prev_time;		/* last time 		*/
 	struct timeval curr_time;		/* time now		*/
 	int history_size;			/* # pts to average over*/
File Added: pkgsrc/net/pload/patches/patch-ae
$NetBSD: patch-ae,v 1.1 2009/01/04 20:03:21 shattered Exp $

--- pload.c.orig	2000-02-01 07:11:24.000000000 +0000
+++ pload.c
@@ -40,7 +40,11 @@ static void HandleExit(void);
 static void CheckForWMExit(Widget, XtPointer, XEvent*, Boolean*);
 static void CheckForIconState(Widget, XtPointer, XEvent*, Boolean*);
 static void update(XtPointer, XtIntervalId*);
+#ifdef __NetBSD__
+static void make_label(char*,u_quad_t,double,double);
+#else
 static void make_label(char*,unsigned long,double,double);
+#endif
 static void do_rate(char*,double);
 static void do_total(char*, double);
 
@@ -621,7 +625,11 @@ void do_rate(char *b, double rate)
 }
 
 /* stores label in global 'buff' */
+#ifdef __NetBSD__
+void make_label(char *fmt, u_quad_t total, double rate, double max)
+#else
 void make_label(char *fmt, unsigned long total, double rate, double max)
+#endif
 {
 	char *p;
 	int i;