diff -Nru wmifs-1.6/autogen.sh wmifs-1.8/autogen.sh --- wmifs-1.6/autogen.sh 1970-01-01 00:00:00.000000000 +0000 +++ wmifs-1.8/autogen.sh 2016-04-21 00:45:26.000000000 +0000 @@ -0,0 +1,2 @@ +#!/bin/sh +autoreconf --force --verbose --install diff -Nru wmifs-1.6/BUGS wmifs-1.8/BUGS --- wmifs-1.6/BUGS 2015-08-27 02:23:36.000000000 +0000 +++ wmifs-1.8/BUGS 2016-04-21 00:45:26.000000000 +0000 @@ -26,7 +26,7 @@ some systems somehow (reported myself) :) * Special thanks to Marcelo - for providing some real usefull patches for WMPPP, + for providing some real useful patches for WMPPP, they will be in the next update for sure! diff -Nru wmifs-1.6/CHANGES wmifs-1.8/CHANGES --- wmifs-1.6/CHANGES 2015-08-27 02:23:36.000000000 +0000 +++ wmifs-1.8/CHANGES 2016-04-21 00:45:26.000000000 +0000 @@ -1,5 +1,24 @@ Version Description -------------------------------------------------------------- +1.8 * Released 160420 + + * Display version number from configure.ac with -v option. + + * Fix typos. Ran `codespell -w .`. + +1.7 * Released 160419 + + * Fix buffer overflow if interface has name > 8 characters. + Patch by anomie@users.sourceforge.net to fix Debian bug #805519. [1] + + * Switch to autotools for build. + + * Add desktop entry file. + + * Update INSTALL after switch to autotools. + + [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=805519 + 1.6 * Released 150824 * wmifs uses now the new library libdockapp that includes the old @@ -127,7 +146,7 @@ options in WMiFS for 'real' multiuser systems, when 'force*' is detected in /etc/wmifsrc the user settings in ~/.wmifsrc are overridden - (usefull for sites where users may not fiddle + (useful for sites where users may not fiddle with pppd's options :) * WMPPP: Ditto, added 'force' facility here too @@ -146,7 +165,7 @@ * WMPPP: dropped the config GUI and added an .wmppprc file instead > motivation to do so: this way, WMPPP is much more platform and - distribution independant :) + distribution independent :) * WMPPP: enhanced the status LED, yellow means dialing, green means online, red means error @@ -165,7 +184,7 @@ * WMiFS: added -w commandline option, this will draw the graph in our new 'waveform' look :) - * WMiFS: fixed the coredump problems that occured + * WMiFS: fixed the coredump problems that occurred on some systems with or without .wmifsrc file typo's, errors, etc. in the .wmifsrc file are now also being ignored/rejected, the worst diff -Nru wmifs-1.6/configure.ac wmifs-1.8/configure.ac --- wmifs-1.6/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ wmifs-1.8/configure.ac 2016-04-21 00:45:26.000000000 +0000 @@ -0,0 +1,9 @@ +AC_INIT([wmifs], [1.8], [wmaker-dev@lists.windowmaker.org]) +AM_INIT_AUTOMAKE([foreign]) +AC_CONFIG_SRCDIR([configure.ac]) +AC_PROG_CC +PKG_CHECK_MODULES([x11], [x11]) +PKG_CHECK_MODULES([xpm], [xpm]) +PKG_CHECK_MODULES([dockapp], [dockapp]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff -Nru wmifs-1.6/debian/changelog wmifs-1.8/debian/changelog --- wmifs-1.6/debian/changelog 2015-08-27 02:22:16.000000000 +0000 +++ wmifs-1.8/debian/changelog 2016-04-21 09:58:41.000000000 +0000 @@ -1,3 +1,25 @@ +wmifs (1.8-1) unstable; urgency=medium + + * New upstream release. + - Fix buffer overflow if interface has name > 8 characters + (Closes: #805519). + * debian/control + - Add dh-autoreconf and pkg-config to Build-Depends. + - Bump Standards-Version to 3.9.8. + - Use https protocol for Vcs-Browser. + - Remove Breaks/Replaces on wmppp.app (<= 1.1-1); version 1.2 was + uploaded to Debian in 1998. + * debian/menu + - Remove file; deprecated in favor of desktop file which was added + upstream. + * debian/rules + - Use all hardening flags. + - Add Wl,--as-needed to LDFLAGS to avoid useless dependencies. + - Drop override targets and use dh_autoreconf; upstream now uses + autotools as build system. + + -- Doug Torrance Thu, 21 Apr 2016 05:58:37 -0400 + wmifs (1.6-1) unstable; urgency=medium * New upstream release. diff -Nru wmifs-1.6/debian/control wmifs-1.8/debian/control --- wmifs-1.6/debian/control 2015-08-27 02:15:55.000000000 +0000 +++ wmifs-1.8/debian/control 2016-04-21 09:54:11.000000000 +0000 @@ -4,21 +4,21 @@ Maintainer: Debian Window Maker Team Uploaders: Doug Torrance Build-Depends: debhelper (>=9), + dh-autoreconf, libdockapp-dev (>= 1:0.7.0), libx11-dev, libxext-dev, - libxpm-dev -Standards-Version: 3.9.6 + libxpm-dev, + pkg-config +Standards-Version: 3.9.8 Homepage: http://windowmaker.org/dockapps/?name=wmifs -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-wmaker/wmifs.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-wmaker/wmifs.git Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmifs.git Package: wmifs Architecture: linux-any Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: wmaker -Breaks: wmppp.app (<= 1.1-1) -Replaces: wmppp.app (<= 1.1-1) Description: WindowMaker dock app for monitoring network traffic wmifs is a dockable applet for X11 that can monitor all your network interfaces. It's designed for WindowMaker's Dock and AfterStep's Wharf, diff -Nru wmifs-1.6/debian/menu wmifs-1.8/debian/menu --- wmifs-1.6/debian/menu 2015-08-27 02:14:05.000000000 +0000 +++ wmifs-1.8/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -?package(wmifs):needs="x11" section="Applications/Network/Monitoring" title="WMifs" command="/usr/bin/wmifs" diff -Nru wmifs-1.6/debian/rules wmifs-1.8/debian/rules --- wmifs-1.6/debian/rules 2015-08-27 02:14:05.000000000 +0000 +++ wmifs-1.8/debian/rules 2016-04-21 00:55:33.000000000 +0000 @@ -1,13 +1,10 @@ #!/usr/bin/make -f -%: - dh $@ - -override_dh_auto_build: - dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -override_dh_auto_install: - dh_auto_install -- prefix=/usr +%: + dh $@ --with autoreconf get-orig-source: uscan --verbose --force-download --no-symlink diff -Nru wmifs-1.6/INSTALL wmifs-1.8/INSTALL --- wmifs-1.6/INSTALL 2015-08-27 02:23:36.000000000 +0000 +++ wmifs-1.8/INSTALL 2016-04-21 00:45:26.000000000 +0000 @@ -23,16 +23,23 @@ Installation -------------------------------------------------------------- -1) % make -2) % su root -3) # make install -4)* # vi ~/.wmifsrc and/or /etc/wmifsrc +1) % ./autogen.sh +2) % ./configure +3) % make +4) % su root +5) # make install +6)* # vi ~/.wmifsrc and/or $sysconfdir/wmifsrc set up the paths to your pppd start, stop & restart scripts -5) % wmifs & (or wmifs -h for brief help). +7) % wmifs & (or wmifs -h for brief help). -4)* This is optional, WMiFS also works fine without them, +6)* This is optional, WMiFS also works fine without them, it's entirely up to you ;-) + See sample.wmifsrc for an example configuration file. + Note that $sysconfdir defaults to /usr/local/etc. You may + change this by running + ./configure --sysconfdir=DIR + prior to building. @@ -40,28 +47,28 @@ -------------------------------------------------------------- For site administrators who don't want their users messing up pppd's configuration files, WMiFS now supports an -/etc/wmifsrc.fixed file. +$sysconfdir/wmifsrc.fixed file. The installation will install the normal user and global -wmifsrc files in $HOME and /etc, NOT the fixed one! +wmifsrc files in $HOME and $sysconfdir, NOT the fixed one! WMiFS scan for 3 files at startup, in the following order: - 1. /etc/wmifsrc + 1. $sysconfdir/wmifsrc 2. $HOME/.wmifsrc - 3. /etc/wmifsrc.fixed + 3. $sysconfdir/wmifsrc.fixed If no .wmifsrc file is found in the users home directory, -WMiFS will use the global one (/etc/wmifsrc, if present +WMiFS will use the global one ($sysconfdir/wmifsrc, if present and valid). -When WMiFS finds a /etc/wmifs.fixed file, all settings -that WMiFS detected in /etc/wmifsrc and/or $HOME/.wmifsrc +When WMiFS finds a $sysconfdir/wmifs.fixed file, all settings +that WMiFS detected in $sysconfdir/wmifsrc and/or $HOME/.wmifsrc will be discarted i.e. OVERRIDDEN! If you want your users to be able to dialout, but you don't want them to mess around, simply move or copy -the default /etc/wmifsrc to /etc/wmifsrc.fixed :) +the default $sysconfdir/wmifsrc to $sysconfdir/wmifsrc.fixed :) Note: When NO wmifsrc files are found at all, WMiFS will work, but quite obvious, WMiFS won't launch any scripts. @@ -87,10 +94,6 @@ General Notes -------------------------------------------------------------- -Note 1: If "make install" fails on your system, please edit - the Makefile to set the paths according to your setup. - "make install" defaults to /usr/local/bin, $HOME & /etc. - -Note 2: Please DO read the HINTS, this file contains some - very usefull tips about WMiFS. +Note: Please DO read the HINTS, this file contains some + very useful tips about WMiFS. diff -Nru wmifs-1.6/Makefile wmifs-1.8/Makefile --- wmifs-1.6/Makefile 2015-08-27 02:23:36.000000000 +0000 +++ wmifs-1.8/Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -prefix =/usr/local -bindir=${prefix}/bin -datarootdir=${prefix}/share -mandir=${datarootdir}/man -man1dir=${mandir}/man1 -CONF=/etc - -CC = gcc -LIBS = -lXpm -lXext -lX11 -ldockapp -OBJS = wmifs.o - -CFLAGS = -Wall -O2 -g - -INSTALL = /usr/bin/install -INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 -INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 -INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 - -.c.o: - $(CC) -DCONF=\"$(CONF)\" $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o - -wmifs: $(OBJS) - $(CC) $(LDFLAGS) -o wmifs $^ $(LIBS) - -all:: wmifs - -clean:: - for i in $(OBJS) ; do \ - rm -f $$i ; \ - done - rm -f wmifs - -install:: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(CONF) - $(INSTALL_DIR) $(DESTDIR)$(man1dir) - $(INSTALL_PROGRAM) wmifs $(DESTDIR)$(bindir) - $(INSTALL_FILE) sample.wmifsrc $(DESTDIR)$(CONF)/wmifsrc - $(INSTALL_FILE) wmifs.1 $(DESTDIR)$(man1dir) - @echo "WMiFS installation finished..." - @echo " " - @echo "have fun! ;-)" diff -Nru wmifs-1.6/Makefile.am wmifs-1.8/Makefile.am --- wmifs-1.6/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ wmifs-1.8/Makefile.am 2016-04-21 00:45:26.000000000 +0000 @@ -0,0 +1,10 @@ +bin_PROGRAMS = wmifs +dist_man_MANS = wmifs.1 +EXTRA_DIST = BUGS CHANGES HINTS sample.wmifsrc wmifs-mask.xbm wmifs-master.xpm + +AM_CPPFLAGS = -DCONF=\"@sysconfdir@\" +AM_CFLAGS = $(x11_CFLAGS) $(xpm_CFLAGS) $(dockapp_CFLAGS) +LIBS += $(x11_LIBS) $(xpm_LIBS) $(dockapp_LIBS) + +desktopdir = @datadir@/applications +dist_desktop_DATA = wmifs.desktop diff -Nru wmifs-1.6/README wmifs-1.8/README --- wmifs-1.6/README 2015-08-27 02:23:36.000000000 +0000 +++ wmifs-1.8/README 2016-04-21 00:45:26.000000000 +0000 @@ -26,7 +26,7 @@ * Autosensing of *ALL* active network interfaces; * Integrated autoscaling (per interface) transfer - statistics, tested upto 100Mbit; + statistics, tested up to 100Mbit; * Displays a 'normal' xload style graph or our new 'waveform' like load graph; * Realtime cycling through active interfaces by simply @@ -37,10 +37,10 @@ interface, even 'lo' is supported (-h for help); * User-definable scripts for left/middle/right mouse buttons which are read from ~/.wmifsrc (optional); - * Fixed rc file option, usefull for sites where users + * Fixed rc file option, useful for sites where users are not allowed to mess with pppd; -WMiFS is developped on DEC Alpha machines running RedHat-5.0/Linux, +WMiFS is developed on DEC Alpha machines running RedHat-5.0/Linux, but, WMiFS has also been intensively tested on x86 and 68K RedHat/ Linux machines ;-) diff -Nru wmifs-1.6/wmifs.c wmifs-1.8/wmifs.c --- wmifs-1.6/wmifs.c 2015-08-27 02:23:36.000000000 +0000 +++ wmifs-1.8/wmifs.c 2016-04-21 00:45:26.000000000 +0000 @@ -128,7 +128,7 @@ * Used the DrawStats routine from wmifs in wmppp * I decided to add a list in this source file with name of ppl who helped me build this code better. - * I finally removed the /proc/net/route dependancy + * I finally removed the /proc/net/route dependency All of the connections are taken from /proc/net/dev. /proc/net/route is still used for checking if it is on-line. 27/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) @@ -137,7 +137,7 @@ 25/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) * Changed the checknetdevs routine, a lot! 23/04/1998 (Martijn Pieterse, pieterse@xs4all.nl) - * Added line speed detection. via seperate exec. (this has to be suid root!) + * Added line speed detection. via separate exec. (this has to be suid root!) Speed has to be no more than 99999 * Added speed and forcespeed in ~/.wmppprc and /etc/wmppprc * wmifs: added on-line detection scheme, update the bitmap coordinates @@ -243,10 +243,9 @@ #define LED_NET_TX (5) #define LED_NET_POWER (6) -#define WMIFS_VERSION "1.6" - /* the size of the buffer read from /proc/net/ */ #define BUFFER_SIZE 512 + /**********************/ /* External Variables */ /**********************/ @@ -317,7 +316,7 @@ switch (arg[1]) { case 'c' : if (argc > i+1) { - strcpy(color, argv[i+1]); + strncpy(color, argv[i+1], sizeof(color)); i++; } break; @@ -392,7 +391,7 @@ typedef struct { - char name[8]; + char name[IFNAMSIZ]; int his[55][2]; long istatlast; long ostatlast; @@ -478,7 +477,7 @@ fprintf(stderr, "Unknown $HOME directory, please check your environment\n"); return; } - strcpy(temp, p); + strncpy(temp, p, BUFFER_SIZE - 10); strcat(temp, "/.wmifsrc"); parse_rcfile(temp, wmifs_keys); @@ -852,7 +851,7 @@ int i = 0, j; int k; int devsfound = 0; - char foundbuffer[MAX_STAT_DEVICES][8]; + char foundbuffer[MAX_STAT_DEVICES][IFNAMSIZ]; for (i = 0; i < MAX_STAT_DEVICES; i++) foundbuffer[i][0] = 0; @@ -890,7 +889,7 @@ skip it! */ if (strcmp(p, "lo") || (active_interface && !strcmp(active_interface, "lo"))) { - strcpy(foundbuffer[devsfound], p); + strncpy(foundbuffer[devsfound], p, IFNAMSIZ); devsfound++; } if (devsfound >= MAX_STAT_DEVICES) @@ -930,7 +929,7 @@ for (j = 0; j < MAX_STAT_DEVICES; j++) { if (foundbuffer[j][0]) { - strcpy(stat_devices[i].name, foundbuffer[j]); + strncpy(stat_devices[i].name, foundbuffer[j], IFNAMSIZ); for (k = 0; k < 48; k++) { stat_devices[i].his[k][0] = 0; @@ -948,7 +947,7 @@ break; } if (!k) { - strcpy(stat_devices[i].name, active_interface); + strncpy(stat_devices[i].name, active_interface, IFNAMSIZ); for (k = 0; k < 48; k++) { stat_devices[i].his[k][0] = 0; stat_devices[i].his[k][1] = 0; @@ -1049,7 +1048,7 @@ void printversion(void) { - fprintf(stderr, "%s\n", WMIFS_VERSION); + fprintf(stderr, "%s\n", PACKAGE_STRING); } /*******************************************************************************\ diff -Nru wmifs-1.6/wmifs.desktop wmifs-1.8/wmifs.desktop --- wmifs-1.6/wmifs.desktop 1970-01-01 00:00:00.000000000 +0000 +++ wmifs-1.8/wmifs.desktop 2016-04-21 00:45:26.000000000 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=WMiFS +Comment=Complete network monitoring dockapp +Exec=wmifs +Categories=Network;Monitor +Keywords=network monitor;dockapp;window maker