Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nfswatch for openSUSE:Factory checked in at 2026-01-14 16:24:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfswatch (Old) and /work/SRC/openSUSE:Factory/.nfswatch.new.1928 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfswatch" Wed Jan 14 16:24:19 2026 rev:13 rq:1327163 version:4.99.14 Changes: -------- --- /work/SRC/openSUSE:Factory/nfswatch/nfswatch.changes 2024-12-16 19:18:23.513588639 +0100 +++ /work/SRC/openSUSE:Factory/.nfswatch.new.1928/nfswatch.changes 2026-01-14 16:24:45.249106287 +0100 @@ -1,0 +2,27 @@ +Tue Jan 13 17:33:05 UTC 2026 - Andreas Prittwitz <[email protected]> + +- Update to version 4.99.14 + * remove makefile.patch, fixed upstream + * remove nfswatch-4.99.11-sysmacros.patch, fixed upstream + * remove nfswatch-fix-proto.patch, fixed upstream + * Fix to allow build using gcc version 15 due to problems with + old-style function definitions +- Changes in version 4.99.13 + * Warn only once when receiving packets for an unsupported + NFS version + * nfswatch fails to cross build from source, because the + upstream Makefile hard codes the build architecture + pkg-config. After making it substitutable, it cross builds + just fine as dh_auto_build passes the standard substitution. + * Fix typo in error mesage when filelist is missing + * Correct manpage sections. + * rm ChangeLog now that we are in git; note one more change in spec + and README +- Changes in version 4.99.12 + * use libtirpc + * replace sighold() and sigrelse() by sigprocmask() + * include <sys/sysmacros.h> in util.c + * fix printf format issues in screen.c + * fix prototype of rpcxdr_getargs() in rpcutil.c + +------------------------------------------------------------------- @@ -36 +62,0 @@ -------------------------------------------------------------------- Old: ---- makefile.patch nfswatch-4.99.11-sysmacros.patch nfswatch-4.99.11.tar.gz nfswatch-fix-proto.patch New: ---- nfswatch-4.99.14.tar.gz ----------(Old B)---------- Old:- Update to version 4.99.14 * remove makefile.patch, fixed upstream * remove nfswatch-4.99.11-sysmacros.patch, fixed upstream Old: * remove makefile.patch, fixed upstream * remove nfswatch-4.99.11-sysmacros.patch, fixed upstream * remove nfswatch-fix-proto.patch, fixed upstream Old: * remove nfswatch-4.99.11-sysmacros.patch, fixed upstream * remove nfswatch-fix-proto.patch, fixed upstream * Fix to allow build using gcc version 15 due to problems with ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfswatch.spec ++++++ --- /var/tmp/diff_new_pack.PPPu3o/_old 2026-01-14 16:24:46.169144499 +0100 +++ /var/tmp/diff_new_pack.PPPu3o/_new 2026-01-14 16:24:46.169144499 +0100 @@ -1,7 +1,7 @@ # # spec file for package nfswatch # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,13 @@ Name: nfswatch -Version: 4.99.11 +Version: 4.99.14 Release: 0 Summary: An NFS traffic monitoring tool License: BSD-2-Clause Group: Productivity/Networking/NFS URL: http://nfswatch.sourceforge.net Source: %{name}-%{version}.tar.gz -Patch0: makefile.patch -Patch1: nfswatch-4.99.11-sysmacros.patch -Patch2: nfswatch-fix-proto.patch BuildRequires: libpcap-devel BuildRequires: ncurses-devel %if 0%{?suse_version} >= 1500 @@ -40,11 +37,6 @@ %prep %setup -q -%if 0%{?suse_version} >= 1500 -%patch -P 0 -p1 -%endif -%patch -P 1 -p1 -%patch -P 2 -p1 %build ++++++ nfswatch-4.99.11.tar.gz -> nfswatch-4.99.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/ChangeLog new/nfswatch-4.99.14/ChangeLog --- old/nfswatch-4.99.11/ChangeLog 2010-04-23 08:44:49.000000000 +0200 +++ new/nfswatch-4.99.14/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,379 +0,0 @@ -2010-04-22 17:56 c4chris - - * rpcfilter.c: Fix build on alpha Linux. - -2010-04-21 17:21 c4chris - - * ChangeLog: Add ChangeLog file. - -2009-04-21 07:42 c4chris - - * nfswatch.c, pktfilter.c: Fix compile on non-Linux (patch from - Helen Chao). - -2009-04-15 18:26 c4chris - - * README: Convert to utf8. - -2009-04-15 18:21 c4chris - - * netaddr.c: Add TODO item about broken strict aliasing rule. - -2009-04-15 17:43 c4chris - - * nfswatch.spec: Update changelog. - -2009-04-15 17:40 c4chris - - * README, nfswatch.spec: Bump version number to 4.99.10. - -2009-02-18 13:24 c4chris - - * nfswatch.c: Add TODO item, count by interface. - -2009-02-03 13:51 c4chris - - * externs.h, linux.c, nfswatch.c, pktfilter.c: Introduce - pkt_filter_sll() and use it. - -2009-02-02 20:14 c4chris - - * nfswatch.c: Print friendlier message. - -2009-02-02 20:10 c4chris - - * linux.c: Attempt to properly grok LINUX_SLL packets. - -2009-02-02 00:33 c4chris - - * Makefile, externs.h, linux.c, nfswatch.c, nfswatch.h, util.c: Use - the pcap library for Linux. Still need to grok the LINUX_SLL - link type... - -2008-12-11 15:46 c4chris - - * netaddr.c, rpcfilter.c: Add TODO items. - -2007-05-25 16:41 c4chris - - * nfswatch.spec: Update changelog. - -2007-05-25 16:40 c4chris - - * README, nfswatch.h, nfswatch.spec: Bump version number to 4.99.9. - -2007-05-18 18:03 c4chris - - * rpcfilter.c: Do not handle the second argument of RENAME3 and - LINK3, as it doesn't seem to work anyway. - -2007-03-28 23:50 c4chris - - * parsenfsfh.c: Add missing include to use ntohl(). - -2007-03-28 23:43 c4chris - - * parsenfsfh.c, rpcfilter.c, util.c: Improve filehandle decoding on - Linux. - -2007-03-28 17:39 c4chris - - * util.c: Exclude known non-exports instead of guessing exports. - -2007-03-28 16:45 c4chris - - * rpcfilter.c: Handle more Linux filehandle's fsid_type. - -2007-03-13 14:27 c4chris - - * nfswatch.spec: Update changelog. - -2007-03-13 14:25 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.8. - -2007-03-13 14:18 c4chris - - * README: Bring README file up to date. - -2007-03-12 19:32 c4chris - - * dlpi.c: More careful parsing of device name and instance number. - -2007-03-12 18:03 c4chris - - * parsenfsfh.c: Handle more Linux filehandle's fsid_type. - -2007-01-30 15:59 c4chris - - * nfswatch.spec: Update changelog. - -2007-01-30 15:47 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.7. - -2007-01-30 15:44 c4chris - - * nfswatch.spec: Use updated install target of Makefile. - -2007-01-30 15:41 c4chris - - * Makefile: Put in system binaries. - -2007-01-30 15:37 c4chris - - * Makefile: Render Makefile a bit more Linux friendly. - -2006-12-20 16:15 c4chris - - * Makefile, externs.h, logfile.c, nfswatch.c, nfswatch.h, - rpcfilter.c, screen.c, util.c: Add Nick Williams's patch to make - the per-procedure statistics work for NFSv3. - -2006-06-14 13:30 c4chris - - * nfswatch.spec: Update changelog. - -2006-06-14 13:21 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.6. - -2006-06-14 12:50 c4chris - - * Makefile, rpcdefs.h, rpcfilter.c, rpcutil.c, sgi.map.h, xdr.c: - Fix to get things to compile on IRIX6. - -2006-06-13 15:22 c4chris - - * rpcutil.c: Solaris has one additional field in struct xp_ops. - -2006-06-13 15:14 c4chris - - * dlpi.c: The alarm call cannot return an error. - -2006-06-13 15:12 c4chris - - * dlpi.c: Remove unused parameter. - -2006-06-13 15:10 c4chris - - * dlpi.c: Fix signed vs unsigned comparison warnings. - -2006-06-13 11:16 c4chris - - * Makefile, externs.h, nfswatch.c, pktfilter.c, rpcfilter.c, - util.c: Cleanup unused parameters. - -2006-06-13 10:47 c4chris - - * netaddr.c, pktfilter.c: Fix signed vs unsigned comparison - warning. - -2006-06-13 10:41 c4chris - - * nfswatch.h, rpcfilter.c: Fix way to handle long usernames. - -2006-06-12 23:12 c4chris - - * rpcutil.c: Avoid warning about type-punned pointer. - -2005-12-06 13:09 c4chris - - * rpcfilter.c: Special case empty filehandle in LINK3. - -2005-12-05 15:34 c4chris - - * rpcfilter.c: Special case empty filehandle in RENAME3. - -2005-11-29 21:45 c4chris - - * screen.c: Fix 32bit-ism. - -2005-11-22 23:11 c4chris - - * nfswatch.spec: Update changelog. - -2005-11-21 19:07 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.5. - -2005-11-21 17:54 c4chris - - * Makefile, os.h, rpcdefs.h, rpcfilter.c, xdr.c: Allow to build on - older (5.7 and below) Solaris. - -2005-11-21 15:41 c4chris - - * dlpi.c, nfswatch.c: Allow 64-bit compiles on Solaris. - -2005-11-21 14:46 c4chris - - * externs.h, linux.c, nfswatch.c, os.h, pktfilter.c, rpcfilter.c, - screen.c, xdr.c: Cleanup some GCC warning messages on Linux. - -2005-11-16 16:01 c4chris - - * pktfilter.c: Attempt to grab NFS over TCP. - -2005-07-19 16:53 c4chris - - * logfile.c: Enable screendumps in ncurses. - -2005-07-19 15:27 c4chris - - * rpcfilter.c: Print more debug info when length is strange. - -2005-07-19 15:10 c4chris - - * nfslogsum.c, nfswatch.h, rpcfilter.c, util.c: Display portmap - instead of NIS. - -2005-07-19 15:03 c4chris - - * externs.h, nfswatch.c, pktfilter.c, rpcdefs.h, rpcfilter.c: Add - and use call to portmapper. - -2005-07-19 14:59 c4chris - - * screen.c, screen.h, util.c: Provide wider interval column. - -2005-07-12 23:39 c4chris - - * nfswatch.spec: Update changelog. - -2005-07-12 23:28 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.4. - -2005-07-12 23:25 c4chris - - * parsenfsfh.c: Handle linux in Parse_fh(). - -2005-07-12 23:24 c4chris - - * screen.c: Fix total NFS packets count. - -2005-06-02 15:36 c4chris - - * nfswatch.spec: Update changelog. - -2005-06-02 15:32 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.3. - -2005-06-02 15:22 c4chris - - * util.c: Add xfs to the list of recognized filesystems. - -2005-04-22 17:53 c4chris - - * nfswatch.spec: Update changelog. - -2005-04-22 17:50 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.2. - -2005-04-22 17:46 c4chris - - * nfswatch.spec: Fix spec file for Fedora Extras. - -2005-04-22 17:30 c4chris - - * Makefile: Handle RPM_OPT_FLAGS in Makefile. - -2005-02-25 22:54 c4chris - - * rpcfilter.c, rpcutil.c, xdr.c: Add a few comments. - -2005-02-25 17:49 c4chris - - * nfswatch.spec: Update changelog. - -2005-02-25 17:43 c4chris - - * nfswatch.h, nfswatch.spec: Bump version number to 4.99.1. - -2005-02-25 17:34 c4chris - - * nfswatch.h, util.c: Fix c_proc size in a couple structures. - -2005-02-25 16:14 c4chris - - * nfswatch.8: Add Linux info to man page. - -2005-02-25 15:09 c4chris - - * rpcutil.c: Fix xdr_callmsg usage on 64-bit Linux. - -2005-02-25 10:52 c4chris - - * linux.map.h, netaddr.c, parsenfsfh.c, rpcfilter.c, util.c: Parse - NFS file handles in Linux. - -2005-02-23 23:50 c4chris - - * linux.map.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c: Get NFS3 to compile on Linux. Cleanup a bit. - -2005-02-23 22:41 c4chris - - * Makefile, externs.h, rpcdefs.h, rpcfilter.c, xdr.c: Finish NFS3 - setup for Solaris. - -2005-02-23 16:11 c4chris - - * externs.h, nfswatch.c, nfswatch.h, rpcdefs.h, rpcfilter.c, - screen.c, util.c, xdr.c: Started crude hack to get NFS3 working - on Solaris. - -2005-02-07 19:21 c4chris - - * linux.map.h, nfslogsum.c, nfswatch.h, osf.map.h, pktfilter.c, - rpcfilter.c, sgi.map.h, ultrix.map.h, util.c: Start work on - NFSv3. Remove ND (Sun's network disk) stuff. - -2005-02-06 17:05 c4chris - - * nfswatch.spec: Fix pasto in nfswatch.spec. - -2005-02-06 17:00 c4chris - - * LICENSE, nfswatch.h: Add LICENSE file. - -2005-02-06 16:56 c4chris - - * nfswatch.spec: Add nfswatch.spec. - -2005-02-02 11:23 c4chris - - * pktfilter.c: Remove leftover debug fprintf. - -2005-02-02 00:30 c4chris - - * dlpi.c, externs.h, linux.map.h, nfswatch.c, pktfilter.c, - rpcdefs.h, rpcfilter.c, rpcutil.c, screen.c, util.c, xdr.c: Get a - clean compile on Solaris 9. - -2005-02-01 22:38 c4chris - - * util.c: Remove malloc() declaration. - -2005-02-01 19:06 c4chris - - * Makefile, dlpi.c, externs.h, ipports.h, logfile.c, netaddr.c, - nfsfh.h, nfslogsum.8, nfslogsum.c, nfswatch.8, nfswatch.c, - nfswatch.h, nit.c, os.h, osf.map.h, parsenfsfh.c, pfilt.c, - pktfilter.c, rpcdefs.h, rpcfilter.c, rpcutil.c, screen.c, - screen.h, sgi.map.h, snoop.c, ultrix.map.h, util.c, xdr.c, - linux.c, linux.map.h: Hack with an axe so that it compiles and - runs on Linux. - -2005-02-01 18:40 c4chris - - * Makefile, README, dlpi.c, externs.h, fhandle_layouts, ipports.h, - logfile.c, netaddr.c, nfsfh.h, nfslogsum.8, nfslogsum.c, - nfswatch.8, nfswatch.c, nfswatch.h, nit.c, os.h, osf.map.h, - parsenfsfh.c, pfilt.c, pfopen.c, pktfilter.c, rpcdefs.h, - rpcfilter.c, rpcutil.c, screen.c, screen.h, sgi.map.h, snoop.c, - ultrix.map.h, util.c, xdr.c: Hmmph. Moving files around... - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/Makefile new/nfswatch-4.99.14/Makefile --- old/nfswatch-4.99.11/Makefile 2009-02-02 00:33:37.000000000 +0100 +++ new/nfswatch-4.99.14/Makefile 2024-03-20 23:01:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.11 2009/02/01 23:33:37 c4chris Exp $ +# $Id$ # # Makefile for nfswatch. # @@ -33,6 +33,7 @@ INSTALL=install MANSUF= 8.gz STRIP= -s +PKG_CONFIG?= pkg-config IRIX40CFLAGS= -DIRIX40 -O -cckr IRIX51CFLAGS= -DIRIX51 -DIRIX40 -O -cckr -D_BSD_SIGNALS @@ -45,7 +46,7 @@ SVR4CFLAGS= -DSVR4 -O ULTRIXCFLAGS= -DULTRIX -O DECOSFCFLAGS= -DDECOSF -O -LINUXCFLAGS= -DLINUX -O -Wall -W $(RPM_OPT_FLAGS) +LINUXCFLAGS= -DLINUX -O -Wall -W $(shell $(PKG_CONFIG) --cflags libtirpc) $(RPM_OPT_FLAGS) IRIX40LIBS= -lcurses -ltermcap -lsun -lm IRIX51LIBS= -lcurses -ltermcap -lm @@ -58,7 +59,7 @@ ULTRIXLIBS= -lcurses -ltermcap -lm #DECOSFLIBS= -lcurses -ltermcap -lm DECOSFLIBS= -lcurses -ltermcap -lm pfopen.c -LINUXLIBS= -lpcap -lncurses -lm +LINUXLIBS= -lpcap $(shell $(PKG_CONFIG) --libs libtirpc) -lncurses -lm CFLAGS= LIBS= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/README new/nfswatch-4.99.14/README --- old/nfswatch-4.99.11/README 2010-04-23 08:57:04.000000000 +0200 +++ new/nfswatch-4.99.14/README 2025-01-30 01:23:06.000000000 +0100 @@ -1,3 +1,36 @@ + 30 Jan 2025 + +This is NFSWATCH Version 4.99.14. Changes from Version 4.99.13 are: + + - Fix to allow build using gcc version 15 + due to problems with old-style function definitions + + 20 Mar 2024 + +This is NFSWATCH Version 4.99.13. Changes from Version 4.99.12 are: + + - Warn only once when receiving packets for an unsupported NFS version + - nfswatch fails to cross build from source, because the upstream + Makefile hard codes the build architecture pkg-config. After making + it substitutable, it cross builds just fine as dh_auto_build passes + the standard substitution. + - Fix typo in error mesage when filelist is missing + - Correct manpage sections. + - rm ChangeLog now that we are in git; note one more change in spec + and README + + 2 Aug 2022 + +This is NFSWATCH Version 4.99.12. Changes from Version 4.99.11 are: + + - use libtirpc + - replace sighold() and sigrelse() by sigprocmask() + - include <sys/sysmacros.h> in util.c + - fix printf format issues in screen.c + - fix prototype of rpcxdr_getargs() in rpcutil.c + +------------------------------------------------------------------------------- + 23 Apr 2010 This is NFSWATCH Version 4.99.11. Changes from Version 4.99.10 are: @@ -336,8 +369,7 @@ Current Maintainer: Christian Iseli -Ludwig Institute for Cancer Research and -Swiss Institute of Bioinformatics -Bâtiment Génopode, Université de Lausanne +Ecole Polytechnique Fédérale de Lausanne (EPFL) +Bâtiment AAB, Station 19 CH-1015 Lausanne, Switzerland [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/dlpi.c new/nfswatch-4.99.14/dlpi.c --- old/nfswatch-4.99.11/dlpi.c 2007-03-12 19:32:11.000000000 +0100 +++ new/nfswatch-4.99.14/dlpi.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: dlpi.c,v 1.8 2007/03/12 18:32:11 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/externs.h new/nfswatch-4.99.14/externs.h --- old/nfswatch-4.99.11/externs.h 2009-02-03 13:51:50.000000000 +0100 +++ new/nfswatch-4.99.14/externs.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: externs.h,v 1.11 2009/02/03 12:51:50 c4chris Exp $ + * $Id$ * * externs.h - external definitons for nfswatch. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/ipports.h new/nfswatch-4.99.14/ipports.h --- old/nfswatch-4.99.11/ipports.h 2005-02-01 19:06:28.000000000 +0100 +++ new/nfswatch-4.99.14/ipports.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: ipports.h,v 1.2 2005/02/01 18:06:28 c4chris Exp $ + * $Id$ * * ipport.h - port definitions used by nfswatch, not provided by Ultrix * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/linux.c new/nfswatch-4.99.14/linux.c --- old/nfswatch-4.99.11/linux.c 2009-02-03 13:51:50.000000000 +0100 +++ new/nfswatch-4.99.14/linux.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: linux.c,v 1.5 2009/02/03 12:51:50 c4chris Exp $ + * $Id$ * * Christian Iseli * Ludwig Institute for Cancer Research diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/linux.map.h new/nfswatch-4.99.14/linux.map.h --- old/nfswatch-4.99.11/linux.map.h 2005-02-25 10:52:03.000000000 +0100 +++ new/nfswatch-4.99.14/linux.map.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: linux.map.h,v 1.5 2005/02/25 09:52:03 c4chris Exp $ + * $Id$ */ /* DIRECT include of SunOS 4.1 <nfs/nfs.h> as the IRIX <sys/fs/nfs.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/logfile.c new/nfswatch-4.99.14/logfile.c --- old/nfswatch-4.99.11/logfile.c 2006-12-20 16:15:45.000000000 +0100 +++ new/nfswatch-4.99.14/logfile.c 2025-01-30 00:25:06.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: logfile.c,v 1.4 2006/12/20 15:15:45 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -21,6 +21,7 @@ #include <stdio.h> #include <string.h> #include <math.h> +#include <time.h> #include "nfswatch.h" #include "externs.h" @@ -123,7 +124,6 @@ update_logfile(void) { char *tstr; - char *ctime(); float percent; char buf[BUFSIZ]; struct timeval tv; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/netaddr.c new/nfswatch-4.99.14/netaddr.c --- old/nfswatch-4.99.11/netaddr.c 2009-04-15 18:21:40.000000000 +0200 +++ new/nfswatch-4.99.14/netaddr.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: netaddr.c,v 1.6 2009/04/15 16:21:40 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfsfh.h new/nfswatch-4.99.14/nfsfh.h --- old/nfswatch-4.99.11/nfsfh.h 2005-02-01 19:06:29.000000000 +0100 +++ new/nfswatch-4.99.14/nfsfh.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: nfsfh.h,v 1.2 2005/02/01 18:06:29 c4chris Exp $ + * $Id$ * * nfsfh.h - NFS file handle definitions (for portable use) * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfslogsum.8 new/nfswatch-4.99.14/nfslogsum.8 --- old/nfswatch-4.99.11/nfslogsum.8 2005-02-01 19:06:29.000000000 +0100 +++ new/nfswatch-4.99.14/nfslogsum.8 2022-08-05 09:51:05.000000000 +0200 @@ -1,9 +1,9 @@ .ig -.\" $Id: nfslogsum.8,v 1.2 2005/02/01 18:06:29 c4chris Exp $ +.\" $Id$ .. .ds @N \s-1NFS\s0 -.TH NFSLOGSUM 8L "January 1993" Purdue/DEC +.TH NFSLOGSUM 8 "January 1993" Purdue/DEC .SH NAME nfslogsum \- summarize \fBnfswatch\fP log file .SH SYNOPSIS @@ -164,7 +164,7 @@ .IR statfs (2) system call. .SH SEE ALSO -.IR nfswatch (8L) +.IR nfswatch (8) .SH BUGS .PP .I nfslogsum diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfslogsum.c new/nfswatch-4.99.14/nfslogsum.c --- old/nfswatch-4.99.11/nfslogsum.c 2005-07-19 15:10:22.000000000 +0200 +++ new/nfswatch-4.99.14/nfslogsum.c 2025-01-30 00:39:20.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: nfslogsum.c,v 1.4 2005/07/19 13:10:22 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -51,17 +51,15 @@ " READDIR", " STATFS", 0 }; -char *index(); - void dumpit(); void dumpit2(); -void parsenfs(); -void parsetop(); -void parsefile(); -void parsepkts(); -void parseproc(); +void parsenfs(FILE *fp); +void parsetop(FILE *fp); +void parsefile(FILE *fp); +void parsepkts(FILE *fp); +void parseproc(char *line, Counter *ctrs); void clearvars(); -void parsetotals(); +void parsetotals(FILE *fp); static int findnfs(char *); static int findfile(char *); @@ -277,9 +275,7 @@ /* * parsetop - parse the top of the log session. */ -void -parsetop(fp) -FILE *fp; +void parsetop(FILE *fp) { int nskip = 0; char line[BUFSIZ]; @@ -319,9 +315,7 @@ /* * parsetotals - parse the totals section. */ -void -parsetotals(fp) -FILE *fp; +void parsetotals(FILE *fp) { int x, y, z; int nskip = 0; @@ -359,9 +353,7 @@ /* * parsepkts - parse packet counter section. */ -void -parsepkts(fp) -FILE *fp; +void parsepkts(FILE *fp) { int x, y, z; int nskip = 0; @@ -408,9 +400,7 @@ /* * parsenfs - parse the NFS counter section. */ -void -parsenfs(fp) -FILE *fp; +void parsenfs(FILE *fp) { int x, y, z; int nskip = 0; @@ -457,9 +447,7 @@ /* * parsefile - parse the file counter section. */ -void -parsefile(fp) -FILE *fp; +void parsefile(FILE *fp) { int x, y, z; int nskip = 0; @@ -506,10 +494,7 @@ /* * parseproc - parse the NFS procedure counters. */ -void -parseproc(line, ctrs) -Counter *ctrs; -char *line; +void parseproc(char *line, Counter *ctrs) { register int i; register char *s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfswatch.8 new/nfswatch-4.99.14/nfswatch.8 --- old/nfswatch-4.99.11/nfswatch.8 2005-02-25 16:14:03.000000000 +0100 +++ new/nfswatch-4.99.14/nfswatch.8 2022-08-05 09:51:05.000000000 +0200 @@ -1,5 +1,5 @@ .ig -.\" $Id: nfswatch.8,v 1.3 2005/02/25 15:14:03 c4chris Exp $ +.\" $Id$ .. .ds @N \s-1NFS\s0 @@ -347,7 +347,7 @@ The information in the .I nfswatch log file can be summarized easily using the -.IR nfslogsum (8L) +.IR nfslogsum (8) program. .SH COMMANDS .PP @@ -627,7 +627,7 @@ .IR etherfind (8c), .IR dlpi (7), .IR nit (4), -.IR nfslogsum (8L), +.IR nfslogsum (8), .IR packetfilter (4/7), .IR snoop (1m), .IR snoop (7), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfswatch.c new/nfswatch-4.99.14/nfswatch.c --- old/nfswatch-4.99.11/nfswatch.c 2009-04-21 07:42:08.000000000 +0200 +++ new/nfswatch-4.99.14/nfswatch.c 2022-08-05 09:54:13.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: nfswatch.c,v 1.15 2009/04/21 05:42:08 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -481,7 +481,7 @@ break; case SHOWINDVFILES: if (filelist == NULL) { - (void) fprintf(stderr, "%s: must specify file list with -fi.\n", pname); + (void) fprintf(stderr, "%s: must specify file list with -f.\n", pname); finish(-1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfswatch.h new/nfswatch-4.99.14/nfswatch.h --- old/nfswatch-4.99.11/nfswatch.h 2010-04-23 08:57:04.000000000 +0200 +++ new/nfswatch-4.99.14/nfswatch.h 2025-01-30 01:20:00.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: nfswatch.h,v 1.21 2010/04/23 06:57:04 c4chris Exp $ + * $Id$ * * nfswatch.h - definitions for nfswatch. * @@ -15,7 +15,7 @@ /* * Version number. */ -#define VERSION "4.99.11 of 23 April 2010" +#define VERSION "4.99.14 of 30 January 2025" /* * Stuff for representing NFS file handles diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nfswatch.spec new/nfswatch-4.99.14/nfswatch.spec --- old/nfswatch-4.99.11/nfswatch.spec 2010-04-23 08:57:04.000000000 +0200 +++ new/nfswatch-4.99.14/nfswatch.spec 2025-01-30 01:25:04.000000000 +0100 @@ -1,17 +1,14 @@ -# $Id: nfswatch.spec,v 1.25 2010/04/23 06:57:04 c4chris Exp $ Summary: An NFS traffic monitoring tool Name: nfswatch -Version: 4.99.11 +Version: 4.99.14 Release: 1%{?dist} License: BSD URL: http://nfswatch.sourceforge.net -Group: Applications/Internet -Source0: http://dl.sf.net/nfswatch/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libpcap-devel ncurses-devel +BuildRequires: make +BuildRequires: gcc libpcap-devel ncurses-devel libtirpc-devel %description Nfswatch is a command-line tool for monitoring NFS traffic. @@ -30,17 +27,35 @@ rm -rf ${RPM_BUILD_ROOT} make STRIP= MANSUF=8 DESTDIR=${RPM_BUILD_ROOT} install -%clean -rm -rf ${RPM_BUILD_ROOT} - %files -%defattr(-,root,root) %doc LICENSE README %{_sbindir}/nfswatch %{_sbindir}/nfslogsum %{_mandir}/man8/* %changelog +* Thu Jan 30 2025 Christian Iseli <[email protected]> 4.99.14-1 + - Fix FTBFS in Fedora 42 with GCC version 15 + due to problems with old-style function declarations + +* Tue Mar 20 2024 Christian Iseli <[email protected]> 4.99.13-1 + - Warn only once when receiving packets for an unsupported NFS version + - nfswatch fails to cross build from source, because the upstream + Makefile hard codes the build architecture pkg-config. After making + it substitutable, it cross builds just fine as dh_auto_build passes + the standard substitution. + - Fix typo in error mesage when filelist is missing + - Correct manpage sections. + - rm ChangeLog now that we are in git; note one more change in spec + and README + +* Tue Aug 2 2022 Christian Iseli <[email protected]> 4.99.12-1 + - use libtirpc + - replace sighold() and sigrelse() by sigprocmask() + - include <sys/sysmacros.h> in util.c + - fix printf format issues in screen.c + - fix prototype of rpcxdr_getargs() in rpcutil.c + * Fri Apr 23 2010 Christian Iseli <[email protected]> 4.99.11-1 - 2010-04-22 17:56 c4chris * rpcfilter.c: Fix build on alpha Linux. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/nit.c new/nfswatch-4.99.14/nit.c --- old/nfswatch-4.99.11/nit.c 2005-02-01 19:06:29.000000000 +0100 +++ new/nfswatch-4.99.14/nit.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: nit.c,v 1.2 2005/02/01 18:06:29 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/os.h new/nfswatch-4.99.14/os.h --- old/nfswatch-4.99.11/os.h 2005-11-21 17:54:02.000000000 +0100 +++ new/nfswatch-4.99.14/os.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: os.h,v 1.4 2005/11/21 16:54:02 c4chris Exp $ + * $Id$ * * os.h - operating system definitions. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/osf.map.h new/nfswatch-4.99.14/osf.map.h --- old/nfswatch-4.99.11/osf.map.h 2005-02-07 19:21:13.000000000 +0100 +++ new/nfswatch-4.99.14/osf.map.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,11 +1,11 @@ /* - * $Id: osf.map.h,v 1.3 2005/02/07 18:21:13 c4chris Exp $ + * $Id$ * * HISTORY * */ /* - * @(#)$RCSfile: osf.map.h,v $ $Revision: 1.3 $ (DEC) $Date: 2005/02/07 18:21:13 $ + * @(#)$RCSfile$ $Revision$ (DEC) $Date$ */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/parsenfsfh.c new/nfswatch-4.99.14/parsenfsfh.c --- old/nfswatch-4.99.11/parsenfsfh.c 2007-03-28 23:50:40.000000000 +0200 +++ new/nfswatch-4.99.14/parsenfsfh.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: parsenfsfh.c,v 1.7 2007/03/28 21:50:40 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/pfilt.c new/nfswatch-4.99.14/pfilt.c --- old/nfswatch-4.99.11/pfilt.c 2005-02-01 19:06:29.000000000 +0100 +++ new/nfswatch-4.99.14/pfilt.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: pfilt.c,v 1.2 2005/02/01 18:06:29 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/pktfilter.c new/nfswatch-4.99.14/pktfilter.c --- old/nfswatch-4.99.11/pktfilter.c 2009-04-21 07:42:08.000000000 +0200 +++ new/nfswatch-4.99.14/pktfilter.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: pktfilter.c,v 1.12 2009/04/21 05:42:08 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/rpcdefs.h new/nfswatch-4.99.14/rpcdefs.h --- old/nfswatch-4.99.11/rpcdefs.h 2006-06-14 12:50:49.000000000 +0200 +++ new/nfswatch-4.99.14/rpcdefs.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: rpcdefs.h,v 1.9 2006/06/14 10:50:49 c4chris Exp $ + * $Id$ * * rpcdefs.h - definitions for RPC processing code. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/rpcfilter.c new/nfswatch-4.99.14/rpcfilter.c --- old/nfswatch-4.99.11/rpcfilter.c 2010-04-22 17:56:22.000000000 +0200 +++ new/nfswatch-4.99.14/rpcfilter.c 2025-01-30 00:27:58.000000000 +0100 @@ -1,6 +1,6 @@ /*#define DEBUG 1 */ /* - * $Id: rpcfilter.c,v 1.25 2010/04/22 15:56:22 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -52,6 +52,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> +#include <strings.h> #include <signal.h> #include <math.h> #include <pwd.h> @@ -275,6 +276,7 @@ { struct rpc_msg *msg = (struct rpc_msg *) data; uint32_t prog = ntohl(msg->rm_call.cb_prog); + static int warned = 0; /* * Decide what to do based on the program. @@ -286,8 +288,13 @@ nfs_filter(data, length, src, tstamp); else if (version == 3) nfs3_filter(data, length, src, tstamp); - else - fprintf(stderr, "Unknown NFS version: %d\n", version); + else { + if (!warned) { + fprintf(stderr, "Unknown NFS version: %d\n", version); + fprintf(stderr, " - this warning will only be shown once - nfswatch is unable to monitor this version of NFS\n"); + warned = 1; + } + } break; } case RPC_PMAPPROG: @@ -593,7 +600,10 @@ if (!match1 && learnfs && (nnfscounters < MAXEXPORT)) { static char fsname[64], prefix[64]; #if defined(SVR4) || defined(LINUX) - sighold(SIGALRM); + sigset_t nset, oset; + sigemptyset(&nset); + sigaddset(&nset, SIGALRM); + sigprocmask(SIG_BLOCK, &nset, &oset); #else int oldm; oldm = sigblock(sigmask(SIGALRM)); @@ -618,7 +628,6 @@ AF_INET); if (hp) { - char *index(); char *dotp; sprintf(prefix, "%s", hp->h_name); @@ -657,7 +666,7 @@ sort_nfs_counters(); #if defined(SVR4) || defined(LINUX) - sigrelse(SIGALRM); + sigprocmask(SIG_SETMASK, &oset, NULL); #else (void) sigsetmask(oldm); /* permit redisplay */ #endif @@ -835,7 +844,10 @@ struct hostent *hp; static char clnt_name[64]; #if defined(SVR4) || defined(LINUX) - sighold(SIGALRM); + sigset_t nset, oset; + sigemptyset(&nset); + sigaddset(&nset, SIGALRM); + sigprocmask(SIG_BLOCK, &nset, &oset); #else int oldm; oldm = sigblock(sigmask(SIGALRM)); @@ -854,7 +866,6 @@ hp = gethostbyaddr((char *) &ccp->cl_ipaddr, sizeof(ccp->cl_ipaddr), AF_INET); if (hp) { - char *index(); char *dotp; sprintf(clnt_name, "%s", hp->h_name); @@ -873,7 +884,7 @@ ccp->cl_interval = 1; sort_clnt_counters(); #if defined(SVR4) || defined(LINUX) - sigrelse(SIGALRM); + sigprocmask(SIG_SETMASK, &oset, NULL); #else (void) sigsetmask(oldm); /* permit redisplay */ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/rpcutil.c new/nfswatch-4.99.14/rpcutil.c --- old/nfswatch-4.99.11/rpcutil.c 2006-06-14 12:50:49.000000000 +0200 +++ new/nfswatch-4.99.14/rpcutil.c 2022-08-02 13:37:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: rpcutil.c,v 1.8 2006/06/14 10:50:49 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -82,7 +82,7 @@ #include "rpcdefs.h" /* get rpc arguments */ -static bool_t rpcxdr_getargs(SVCXPRT *, xdrproc_t, caddr_t); +static bool_t rpcxdr_getargs(SVCXPRT *, xdrproc_t, void *); /* * Operations on the SVCXPRT structure. We're only going to use @@ -223,7 +223,7 @@ * rpcxdr_getargs - called by SVC_GETARGS. */ static bool_t -rpcxdr_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr) +rpcxdr_getargs(SVCXPRT *xprt, xdrproc_t xdr_args, void *args_ptr) { return((*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/screen.c new/nfswatch-4.99.14/screen.c --- old/nfswatch-4.99.11/screen.c 2006-12-20 16:15:46.000000000 +0100 +++ new/nfswatch-4.99.14/screen.c 2025-01-30 00:29:52.000000000 +0100 @@ -1,5 +1,5 @@ /* - * $Id: screen.c,v 1.10 2006/12/20 15:15:46 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -25,6 +25,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <time.h> #include "nfswatch.h" #include "externs.h" @@ -164,7 +165,6 @@ { int len; char *tstr; - char *ctime(); char buf[BUFSIZ]; struct timeval tv; register struct scrtxt *st; @@ -224,8 +224,8 @@ len = strlen(buf); - (void) mvprintw(SCR_IF_Y, SCR_MIDDLE - (len/2), buf); - (void) mvprintw(SCR_PROMPT_Y, SCR_PROMPT_X0, prompt); + (void) mvprintw(SCR_IF_Y, SCR_MIDDLE - (len/2), "%s", buf); + (void) mvprintw(SCR_PROMPT_Y, SCR_PROMPT_X0, "%s", prompt); } /* @@ -359,7 +359,6 @@ update_screen(void) { char *tstr; - char *ctime(); float percent; struct timeval tv; register int i, nfstotal; @@ -377,10 +376,10 @@ */ (void) mvprintw(SCR_ELAPS_Y, SCR_ELAPS_X, "%10s", tstr); (void) mvprintw(SCR_PKTINT_Y, SCR_PKTINT_X, - "%10d (network) %10d (to host) %10d (dropped)", + "%10ld (network) %10ld (to host) %10ld (dropped)", int_pkt_total, int_dst_pkt_total, int_pkt_drops); (void) mvprintw(SCR_PKTTOT_Y, SCR_PKTTOT_X, - "%10d (network) %10d (to host) %10d (dropped)", + "%10ld (network) %10ld (to host) %10ld (dropped)", pkt_total, dst_pkt_total, pkt_drops); /* @@ -397,7 +396,7 @@ } (void) mvprintw(pkt_counters[i].pc_inty, - pkt_counters[i].pc_intx, "%7d", + pkt_counters[i].pc_intx, "%7ld", pkt_counters[i].pc_interval); (void) mvprintw(pkt_counters[i].pc_pcty, @@ -405,7 +404,7 @@ percent); (void) mvprintw(pkt_counters[i].pc_toty, - pkt_counters[i].pc_totx, "%8d", + pkt_counters[i].pc_totx, "%8ld", pkt_counters[i].pc_total); } @@ -437,7 +436,7 @@ } (void) mvprintw(nfs_counters[i - soff].nc_inty, - nfs_counters[i - soff].nc_intx, "%5d", + nfs_counters[i - soff].nc_intx, "%5ld", nfs_counters[i].nc_interval); (void) mvprintw(nfs_counters[i - soff].nc_pcty, @@ -445,7 +444,7 @@ percent); (void) mvprintw(nfs_counters[i - soff].nc_toty, - nfs_counters[i - soff].nc_totx, "%8d", + nfs_counters[i - soff].nc_totx, "%8ld", nfs_counters[i].nc_total); } } @@ -471,7 +470,7 @@ percent = 0.0; (void) mvprintw(prc_counters[NFSv2][i - soff].pr_inty, - prc_counters[NFSv2][i - soff].pr_intx, "%5d", + prc_counters[NFSv2][i - soff].pr_intx, "%5ld", prc_counters[NFSv2][i].pr_interval); (void) mvprintw(prc_counters[NFSv2][i - soff].pr_pcty, @@ -479,7 +478,7 @@ percent); (void) mvprintw(prc_counters[NFSv2][i - soff].pr_toty, - prc_counters[NFSv2][i - soff].pr_totx, "%8d", + prc_counters[NFSv2][i - soff].pr_totx, "%8ld", prc_counters[NFSv2][i].pr_total); count = prc_counters[NFSv2][i].pr_complete; @@ -496,7 +495,7 @@ (void) mvprintw(prc_counters[NFSv2][i - soff].pr_compy, prc_counters[NFSv2][i - soff].pr_compx, - "%8d", + "%8ld", count); (void) mvprintw(prc_counters[NFSv2][i - soff].pr_respy, @@ -537,7 +536,7 @@ percent = 0.0; (void) mvprintw(prc_counters[NFSv3][i - soff].pr_inty, - prc_counters[NFSv3][i - soff].pr_intx, "%5d", + prc_counters[NFSv3][i - soff].pr_intx, "%5ld", prc_counters[NFSv3][i].pr_interval); (void) mvprintw(prc_counters[NFSv3][i - soff].pr_pcty, @@ -545,7 +544,7 @@ percent); (void) mvprintw(prc_counters[NFSv3][i - soff].pr_toty, - prc_counters[NFSv3][i - soff].pr_totx, "%8d", + prc_counters[NFSv3][i - soff].pr_totx, "%8ld", prc_counters[NFSv3][i].pr_total); count = prc_counters[NFSv3][i].pr_complete; @@ -562,7 +561,7 @@ (void) mvprintw(prc_counters[NFSv3][i - soff].pr_compy, prc_counters[NFSv3][i - soff].pr_compx, - "%8d", + "%8ld", count); (void) mvprintw(prc_counters[NFSv3][i - soff].pr_respy, @@ -601,7 +600,7 @@ percent = 0.0; (void) mvprintw(clnt_counters[i - soff].cl_inty, - clnt_counters[i - soff].cl_intx, "%5d", + clnt_counters[i - soff].cl_intx, "%5ld", clnt_counters[i].cl_interval); (void) mvprintw(clnt_counters[i - soff].cl_pcty, @@ -609,7 +608,7 @@ percent); (void) mvprintw(clnt_counters[i - soff].cl_toty, - clnt_counters[i - soff].cl_totx, "%8d", + clnt_counters[i - soff].cl_totx, "%8ld", clnt_counters[i].cl_total); } } @@ -637,7 +636,7 @@ (void) mvprintw(auth_counters[i - soff].ac_inty, auth_counters[i - soff].ac_intx, - "%5d", + "%5ld", auth_counters[i].ac_interval); (void) mvprintw(auth_counters[i - soff].ac_pcty, @@ -647,7 +646,7 @@ (void) mvprintw(auth_counters[i - soff].ac_toty, auth_counters[i - soff].ac_totx, - "%8d", + "%8ld", auth_counters[i].ac_total); } } @@ -673,7 +672,7 @@ } (void) mvprintw(fil_counters[i - soff].fc_inty, - fil_counters[i - soff].fc_intx, "%5d", + fil_counters[i - soff].fc_intx, "%5ld", fil_counters[i].fc_interval); (void) mvprintw(fil_counters[i - soff].fc_pcty, @@ -681,7 +680,7 @@ percent); (void) mvprintw(fil_counters[i - soff].fc_toty, - fil_counters[i - soff].fc_totx, "%8d", + fil_counters[i - soff].fc_totx, "%8ld", fil_counters[i].fc_total); } } @@ -715,7 +714,7 @@ mlen = strlen(message); (void)move(SCR_NFSHDR_Y - 1, 0); (void)clrtoeol(); - (void)mvprintw(SCR_NFSHDR_Y - 1, SCR_MIDDLE - (mlen/2), message); + (void)mvprintw(SCR_NFSHDR_Y - 1, SCR_MIDDLE - (mlen/2), "%s", message); /* * Display scrolling information @@ -739,7 +738,9 @@ { register int c; struct itimerval itv; -#if !defined(SVR4) && !defined(LINUX) +#if defined(SVR4) || defined(LINUX) + sigset_t nset, oset; +#else int oldm; #endif int reset_prevshowwhich = 1; @@ -905,14 +906,16 @@ case 'S': reset_prevshowwhich = 0; #if defined(SVR4) || defined(LINUX) - sighold(SIGALRM); + sigemptyset(&nset); + sigaddset(&nset, SIGALRM); + sigprocmask(SIG_BLOCK, &nset, &oset); #else oldm = sigblock(sigmask(SIGALRM)); #endif /* no async redisplay while dumping */ snapshot(); #if defined(SVR4) || defined(LINUX) - sigrelse(SIGALRM); + sigprocmask(SIG_SETMASK, &oset, NULL); #else (void) sigsetmask(oldm); /* permit async redisplay */ #endif @@ -933,7 +936,9 @@ * Change the sort order now. */ #if defined(SVR4) || defined(LINUX) - sighold(SIGALRM); + sigemptyset(&nset); + sigaddset(&nset, SIGALRM); + sigprocmask(SIG_BLOCK, &nset, &oset); #else oldm = sigblock(sigmask(SIGALRM)); #endif @@ -943,7 +948,7 @@ sort_clnt_counters(); sort_auth_counters(); #if defined(SVR4) || defined(LINUX) - sigrelse(SIGALRM); + sigprocmask(SIG_SETMASK, &oset, NULL); #else (void) sigsetmask(oldm); /* permit redisplay */ #endif @@ -1098,6 +1103,7 @@ (void) refresh(); break; } + __attribute__ ((fallthrough)); /* not set? drops through to "default" */ default: /* give them some help */ reset_prevshowwhich = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/screen.h new/nfswatch-4.99.14/screen.h --- old/nfswatch-4.99.11/screen.h 2005-07-19 14:59:51.000000000 +0200 +++ new/nfswatch-4.99.14/screen.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: screen.h,v 1.3 2005/07/19 12:59:51 c4chris Exp $ + * $Id$ * * screen.h - definitions for the display screen. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/sgi.map.h new/nfswatch-4.99.14/sgi.map.h --- old/nfswatch-4.99.11/sgi.map.h 2006-06-14 12:50:49.000000000 +0200 +++ new/nfswatch-4.99.14/sgi.map.h 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: sgi.map.h,v 1.4 2006/06/14 10:50:49 c4chris Exp $ + * $Id$ * * sgi.map.h - made up from various other header files * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/snoop.c new/nfswatch-4.99.14/snoop.c --- old/nfswatch-4.99.11/snoop.c 2005-02-01 19:06:29.000000000 +0100 +++ new/nfswatch-4.99.14/snoop.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: snoop.c,v 1.2 2005/02/01 18:06:29 c4chris Exp $ + * $Id$ */ #include "os.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/ultrix.map.h new/nfswatch-4.99.14/ultrix.map.h --- old/nfswatch-4.99.11/ultrix.map.h 2005-02-07 19:21:13.000000000 +0100 +++ new/nfswatch-4.99.14/ultrix.map.h 2022-08-02 12:37:58.000000000 +0200 @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /cvsroot/nfswatch/nfswatch/ultrix.map.h,v 1.3 2005/02/07 18:21:13 c4chris Exp $ (LBL) + * @(#) $Header$ (LBL) */ /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/util.c new/nfswatch-4.99.14/util.c --- old/nfswatch-4.99.11/util.c 2009-02-02 00:33:37.000000000 +0100 +++ new/nfswatch-4.99.14/util.c 2022-08-02 13:01:17.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: util.c,v 1.17 2009/02/01 23:33:37 c4chris Exp $ + * $Id$ */ #include "os.h" @@ -44,6 +44,7 @@ #endif #ifdef LINUX #include <mntent.h> +#include <sys/sysmacros.h> #endif #include "nfswatch.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfswatch-4.99.11/xdr.c new/nfswatch-4.99.14/xdr.c --- old/nfswatch-4.99.11/xdr.c 2006-06-14 12:50:49.000000000 +0200 +++ new/nfswatch-4.99.14/xdr.c 2022-08-02 12:37:58.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: xdr.c,v 1.9 2006/06/14 10:50:49 c4chris Exp $ + * $Id$ */ #include "os.h"
