diff -pruN 4.99.11-9/ChangeLog 4.99.12-1/ChangeLog
--- 4.99.11-9/ChangeLog	2010-04-23 06:44:49.000000000 +0000
+++ 4.99.12-1/ChangeLog	1970-01-01 00:00:00.000000000 +0000
@@ -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 -pruN 4.99.11-9/debian/changelog 4.99.12-1/debian/changelog
--- 4.99.11-9/debian/changelog	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/changelog	2022-08-05 06:00:27.000000000 +0000
@@ -1,3 +1,12 @@
+nfswatch (4.99.12-1) unstable; urgency=medium
+
+  * New upstream version 4.99.12
+    - Drop patches applied upstream
+  * Declare compliance with Debian policy 4.6.1
+  * Update copyright years for debian/* packaging files
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Fri, 05 Aug 2022 08:00:27 +0200
+
 nfswatch (4.99.11-9) unstable; urgency=medium
 
   * Use mvaddstr() instead of mvprintw() for dynamic string (Closes: #997185)
diff -pruN 4.99.11-9/debian/control 4.99.12-1/debian/control
--- 4.99.11-9/debian/control	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/control	2022-08-05 06:00:27.000000000 +0000
@@ -8,7 +8,7 @@ Build-Depends:
  libpcap0.8-dev,
  libtirpc-dev,
  pkg-config
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Homepage: http://nfswatch.sourceforge.net/
 Vcs-Browser: https://salsa.debian.org/carnil/nfswatch
 Vcs-Git: https://salsa.debian.org/carnil/nfswatch.git
diff -pruN 4.99.11-9/debian/copyright 4.99.12-1/debian/copyright
--- 4.99.11-9/debian/copyright	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/copyright	2022-08-05 06:00:27.000000000 +0000
@@ -32,7 +32,7 @@ License: BSD-Regents-of-the-University-o
 
 Files: debian/*
 Copyright: (C) 2009 Daniel Baumann <daniel@debian.org>
-           (C) 2009-2021 Salvatore Bonaccorso <carnil@debian.org>
+           (C) 2009-2022 Salvatore Bonaccorso <carnil@debian.org>
 License: BSD-3-clause
 
 License: BSD-3-clause
diff -pruN 4.99.11-9/debian/patches/Fix-build-failure-major-minor-undefined-in-glibc-2.28.patch 4.99.12-1/debian/patches/Fix-build-failure-major-minor-undefined-in-glibc-2.28.patch
--- 4.99.11-9/debian/patches/Fix-build-failure-major-minor-undefined-in-glibc-2.28.patch	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/patches/Fix-build-failure-major-minor-undefined-in-glibc-2.28.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-From: Salvatore Bonaccorso <carnil@debian.org>
-Date: Sun, 9 Dec 2018 14:19:52 +0100
-Subject: Fix build failure ('major'/'minor' undefined) in glibc 2.28
-Bug-Debian: https://bugs.debian.org/916003
-
-With glibc 2.28 nfswatch FTBFS with
-
-	...
-	util.c: In function 'setup_nfs_counters':
-	util.c:557:27: warning: implicit declaration of function 'major' [-Wimplicit-function-declaration]
-		nc->nc_dev.Major = major(st.st_dev);
-				   ^~~~~
-	util.c:558:27: warning: implicit declaration of function 'minor'; did you mean 'mknod'? [-Wimplicit-function-declaration]
-		nc->nc_dev.Minor = minor(st.st_dev);
-				   ^~~~~
-				   mknod
-	...
-	cc -o nfswatch dlpi.o logfile.o netaddr.o nfswatch.o nit.o pfilt.o pktfilter.o rpcfilter.o rpcutil.o screen.o snoop.o util.o xdr.o parsenfsfh.o linux.o -lpcap -lncurses -lm
-	/usr/bin/ld: util.o: in function `setup_nfs_counters':
-	util.c:(.text+0x6d9): undefined reference to `major'
-	/usr/bin/ld: util.c:(.text+0x6f6): undefined reference to `minor'
-	/usr/bin/ld: util.c:(.text+0x910): undefined reference to `major'
-	/usr/bin/ld: util.c:(.text+0x928): undefined reference to `minor'
-	/usr/bin/ld: util.o: in function `setup_fil_counters':
-	util.c:(.text+0xa5c): undefined reference to `major'
-	/usr/bin/ld: util.c:(.text+0xa74): undefined reference to `minor'
-	collect2: error: ld returned 1 exit status
-	make[2]: *** [Makefile:165: nfswatch] Error 1
-
-glibc 2.28 no longer defines 'major' and 'minor' in <sys/types.h> and
-requires us to include <sys/sysmacros.h>. (glibc 2.25 starts
-deprecating the macros in <sys/types.h>.)
-
-Thanks: Adrian Bunk <bunk@debian.org>
-Closes: #916003
----
- util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/util.c b/util.c
-index 5b6bb1a63b75..87c08b5149aa 100644
---- a/util.c
-+++ b/util.c
-@@ -44,6 +44,7 @@
- #endif
- #ifdef LINUX
- #include <mntent.h>
-+#include <sys/sysmacros.h>
- #endif
- 
- #include "nfswatch.h"
--- 
-2.20.0.rc2
-
diff -pruN 4.99.11-9/debian/patches/link-with-libtirpc.patch 4.99.12-1/debian/patches/link-with-libtirpc.patch
--- 4.99.11-9/debian/patches/link-with-libtirpc.patch	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/patches/link-with-libtirpc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-Description: Link with libtirpc library
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/954380
-Forwarded: no
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2020-04-18
-
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,7 @@ SVR4LIBS=	-lcurses -lnsl -lsocket -lm
- ULTRIXLIBS=	-lcurses -ltermcap -lm
- #DECOSFLIBS=	-lcurses -ltermcap -lm
- DECOSFLIBS=	-lcurses -ltermcap -lm pfopen.c
--LINUXLIBS=	-lpcap -lncurses -lm
-+LINUXLIBS=	-lpcap -lncurses -lm -ltirpc
- 
- CFLAGS=
- LIBS=
diff -pruN 4.99.11-9/debian/patches/series 4.99.12-1/debian/patches/series
--- 4.99.11-9/debian/patches/series	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/patches/series	2022-08-05 06:00:27.000000000 +0000
@@ -1,5 +1,2 @@
 01-manpage.patch
 fix-typo-in-error-message.patch
-Fix-build-failure-major-minor-undefined-in-glibc-2.28.patch
-link-with-libtirpc.patch
-Use-mvaddstr-instead-of-mvprintw-for-dynamic-string.patch
diff -pruN 4.99.11-9/debian/patches/Use-mvaddstr-instead-of-mvprintw-for-dynamic-string.patch 4.99.12-1/debian/patches/Use-mvaddstr-instead-of-mvprintw-for-dynamic-string.patch
--- 4.99.11-9/debian/patches/Use-mvaddstr-instead-of-mvprintw-for-dynamic-string.patch	2021-11-13 09:58:26.000000000 +0000
+++ 4.99.12-1/debian/patches/Use-mvaddstr-instead-of-mvprintw-for-dynamic-string.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-From 4ba5ff3a319b4cce3a77c2fae6ef0fcf6f460845 Mon Sep 17 00:00:00 2001
-From: Salvatore Bonaccorso <carnil@debian.org>
-Date: Sat, 13 Nov 2021 10:38:00 +0100
-Subject: [PATCH] Use mvaddstr() instead of mvprintw() for dynamic string
-
-buf,prompt and message cannot contain printf formatting codes, so
-replace the mvprintw() with mvaddstr() and avoid adding a '%s' string
-format to the mvprintw() call.
-
-Link: https://bugs.debian.org/997185
-Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
----
- screen.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/screen.c b/screen.c
-index f96c577cb1d3..a9b44434791a 100644
---- a/screen.c
-+++ b/screen.c
-@@ -224,8 +224,8 @@ setup_screen(char *device)
- 
- 	len = strlen(buf);
- 
--	(void) mvprintw(SCR_IF_Y, SCR_MIDDLE - (len/2), buf);
--	(void) mvprintw(SCR_PROMPT_Y, SCR_PROMPT_X0, prompt);
-+	(void) mvaddstr(SCR_IF_Y, SCR_MIDDLE - (len/2), buf);
-+	(void) mvaddstr(SCR_PROMPT_Y, SCR_PROMPT_X0, prompt);
- }
- 
- /*
-@@ -715,7 +715,7 @@ HowMany(char *legend, int number)
- 	mlen = strlen(message);
- 	(void)move(SCR_NFSHDR_Y - 1, 0);
- 	(void)clrtoeol();
--	(void)mvprintw(SCR_NFSHDR_Y - 1, SCR_MIDDLE - (mlen/2), message);
-+	(void)mvaddstr(SCR_NFSHDR_Y - 1, SCR_MIDDLE - (mlen/2), message);
- 	
- 	/*
- 	 * Display scrolling information
--- 
-2.33.1
-
diff -pruN 4.99.11-9/dlpi.c 4.99.12-1/dlpi.c
--- 4.99.11-9/dlpi.c	2007-03-12 18:32:11.000000000 +0000
+++ 4.99.12-1/dlpi.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: dlpi.c,v 1.8 2007/03/12 18:32:11 c4chris Exp $
+ * $Id$
  */
 #include "os.h"
 
diff -pruN 4.99.11-9/externs.h 4.99.12-1/externs.h
--- 4.99.11-9/externs.h	2009-02-03 12:51:50.000000000 +0000
+++ 4.99.12-1/externs.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/ipports.h 4.99.12-1/ipports.h
--- 4.99.11-9/ipports.h	2005-02-01 18:06:28.000000000 +0000
+++ 4.99.12-1/ipports.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/linux.c 4.99.12-1/linux.c
--- 4.99.11-9/linux.c	2009-02-03 12:51:50.000000000 +0000
+++ 4.99.12-1/linux.c	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/linux.map.h 4.99.12-1/linux.map.h
--- 4.99.11-9/linux.map.h	2005-02-25 09:52:03.000000000 +0000
+++ 4.99.12-1/linux.map.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/logfile.c 4.99.12-1/logfile.c
--- 4.99.11-9/logfile.c	2006-12-20 15:15:45.000000000 +0000
+++ 4.99.12-1/logfile.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: logfile.c,v 1.4 2006/12/20 15:15:45 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/Makefile 4.99.12-1/Makefile
--- 4.99.11-9/Makefile	2009-02-01 23:33:37.000000000 +0000
+++ 4.99.12-1/Makefile	2022-08-02 11:00:05.000000000 +0000
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.11 2009/02/01 23:33:37 c4chris Exp $
+# $Id$
 #
 # Makefile for nfswatch.
 #
@@ -45,7 +45,7 @@ SUNOS58CFLAGS=	-DSUNOS58 -DSUNOS5 -O -Wa
 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 +58,7 @@ SVR4LIBS=	-lcurses -lnsl -lsocket -lm
 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 -pruN 4.99.11-9/netaddr.c 4.99.12-1/netaddr.c
--- 4.99.11-9/netaddr.c	2009-04-15 16:21:40.000000000 +0000
+++ 4.99.12-1/netaddr.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: netaddr.c,v 1.6 2009/04/15 16:21:40 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/nfsfh.h 4.99.12-1/nfsfh.h
--- 4.99.11-9/nfsfh.h	2005-02-01 18:06:29.000000000 +0000
+++ 4.99.12-1/nfsfh.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/nfslogsum.8 4.99.12-1/nfslogsum.8
--- 4.99.11-9/nfslogsum.8	2005-02-01 18:06:29.000000000 +0000
+++ 4.99.12-1/nfslogsum.8	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 .ig
-.\" $Id: nfslogsum.8,v 1.2 2005/02/01 18:06:29 c4chris Exp $
+.\" $Id$
 
 ..
 .ds @N \s-1NFS\s0
diff -pruN 4.99.11-9/nfslogsum.c 4.99.12-1/nfslogsum.c
--- 4.99.11-9/nfslogsum.c	2005-07-19 13:10:22.000000000 +0000
+++ 4.99.12-1/nfslogsum.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: nfslogsum.c,v 1.4 2005/07/19 13:10:22 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/nfswatch.8 4.99.12-1/nfswatch.8
--- 4.99.11-9/nfswatch.8	2005-02-25 15:14:03.000000000 +0000
+++ 4.99.12-1/nfswatch.8	2022-08-02 10:37:58.000000000 +0000
@@ -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
diff -pruN 4.99.11-9/nfswatch.c 4.99.12-1/nfswatch.c
--- 4.99.11-9/nfswatch.c	2009-04-21 05:42:08.000000000 +0000
+++ 4.99.12-1/nfswatch.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: nfswatch.c,v 1.15 2009/04/21 05:42:08 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/nfswatch.h 4.99.12-1/nfswatch.h
--- 4.99.11-9/nfswatch.h	2010-04-23 06:57:04.000000000 +0000
+++ 4.99.12-1/nfswatch.h	2022-08-02 13:36:15.000000000 +0000
@@ -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.12 of  2 August 2022"
 
 /*
  * Stuff for representing NFS file handles
diff -pruN 4.99.11-9/nfswatch.spec 4.99.12-1/nfswatch.spec
--- 4.99.11-9/nfswatch.spec	2010-04-23 06:57:04.000000000 +0000
+++ 4.99.12-1/nfswatch.spec	2022-08-02 14:21:29.000000000 +0000
@@ -1,17 +1,15 @@
-# $Id: nfswatch.spec,v 1.25 2010/04/23 06:57:04 c4chris Exp $
+# $Id$
 Summary: An NFS traffic monitoring tool
 Name: nfswatch
-Version: 4.99.11
+Version: 4.99.12
 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 +28,20 @@ make
 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
+* Tue Aug  2 2022 Christian Iseli <Christian.Iseli@epfl.ch> 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 <Christian.Iseli@licr.org> 4.99.11-1
  - 2010-04-22 17:56  c4chris
 	* rpcfilter.c: Fix build on alpha Linux.
diff -pruN 4.99.11-9/nit.c 4.99.12-1/nit.c
--- 4.99.11-9/nit.c	2005-02-01 18:06:29.000000000 +0000
+++ 4.99.12-1/nit.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: nit.c,v 1.2 2005/02/01 18:06:29 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/osf.map.h 4.99.12-1/osf.map.h
--- 4.99.11-9/osf.map.h	2005-02-07 18:21:13.000000000 +0000
+++ 4.99.12-1/osf.map.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/os.h 4.99.12-1/os.h
--- 4.99.11-9/os.h	2005-11-21 16:54:02.000000000 +0000
+++ 4.99.12-1/os.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/parsenfsfh.c 4.99.12-1/parsenfsfh.c
--- 4.99.11-9/parsenfsfh.c	2007-03-28 21:50:40.000000000 +0000
+++ 4.99.12-1/parsenfsfh.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: parsenfsfh.c,v 1.7 2007/03/28 21:50:40 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/pfilt.c 4.99.12-1/pfilt.c
--- 4.99.11-9/pfilt.c	2005-02-01 18:06:29.000000000 +0000
+++ 4.99.12-1/pfilt.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: pfilt.c,v 1.2 2005/02/01 18:06:29 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/pktfilter.c 4.99.12-1/pktfilter.c
--- 4.99.11-9/pktfilter.c	2009-04-21 05:42:08.000000000 +0000
+++ 4.99.12-1/pktfilter.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: pktfilter.c,v 1.12 2009/04/21 05:42:08 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/README 4.99.12-1/README
--- 4.99.11-9/README	2010-04-23 06:57:04.000000000 +0000
+++ 4.99.12-1/README	2022-08-02 14:21:48.000000000 +0000
@@ -1,3 +1,15 @@
+							 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:
diff -pruN 4.99.11-9/rpcdefs.h 4.99.12-1/rpcdefs.h
--- 4.99.11-9/rpcdefs.h	2006-06-14 10:50:49.000000000 +0000
+++ 4.99.12-1/rpcdefs.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/rpcfilter.c 4.99.12-1/rpcfilter.c
--- 4.99.11-9/rpcfilter.c	2010-04-22 15:56:22.000000000 +0000
+++ 4.99.12-1/rpcfilter.c	2022-08-02 11:30:47.000000000 +0000
@@ -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"
@@ -593,7 +593,10 @@ do_nfs_count(my_fsid fsid, ino_t ino, ch
 	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));
@@ -657,7 +660,7 @@ do_nfs_count(my_fsid fsid, ino_t ino, ch
 
 		sort_nfs_counters();
 #if defined(SVR4) || defined(LINUX)
-		sigrelse(SIGALRM);
+		sigprocmask(SIG_SETMASK, &oset, NULL);
 #else
 		(void) sigsetmask(oldm);	/* permit redisplay */
 #endif
@@ -835,7 +838,10 @@ CountSrc(ipaddrt src)
 	    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));
@@ -873,7 +879,7 @@ CountSrc(ipaddrt src)
 	    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 -pruN 4.99.11-9/rpcutil.c 4.99.12-1/rpcutil.c
--- 4.99.11-9/rpcutil.c	2006-06-14 10:50:49.000000000 +0000
+++ 4.99.12-1/rpcutil.c	2022-08-02 11:37:39.000000000 +0000
@@ -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 @@ udprpc_recv(char *data, u_int length, st
  * 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 -pruN 4.99.11-9/screen.c 4.99.12-1/screen.c
--- 4.99.11-9/screen.c	2006-12-20 15:15:46.000000000 +0000
+++ 4.99.12-1/screen.c	2022-08-02 14:00:29.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: screen.c,v 1.10 2006/12/20 15:15:46 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
@@ -224,8 +224,8 @@ setup_screen(char *device)
 
 	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);
 }
 
 /*
@@ -377,10 +377,10 @@ update_screen(void)
 	 */
 	(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 +397,7 @@ update_screen(void)
 		}
 
 		(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 +405,7 @@ update_screen(void)
 			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 +437,7 @@ update_screen(void)
 			}
 
 			(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 +445,7 @@ update_screen(void)
 				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 +471,7 @@ update_screen(void)
 			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 +479,7 @@ update_screen(void)
 			    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 +496,7 @@ update_screen(void)
 
 			(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 +537,7 @@ update_screen(void)
 			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 +545,7 @@ update_screen(void)
 			    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 +562,7 @@ update_screen(void)
 
 			(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 +601,7 @@ update_screen(void)
 			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 +609,7 @@ update_screen(void)
 			    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 +637,7 @@ update_screen(void)
 
 			(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 +647,7 @@ update_screen(void)
 
 			(void) mvprintw(auth_counters[i - soff].ac_toty,
 					auth_counters[i - soff].ac_totx,
-					"%8d",
+					"%8ld",
 					auth_counters[i].ac_total);
 		}
 	}
@@ -673,7 +673,7 @@ update_screen(void)
 			}
 
 			(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 +681,7 @@ update_screen(void)
 				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 +715,7 @@ HowMany(char *legend, int number)
 	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 +739,9 @@ command(void)
 {
 	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 +907,16 @@ command(void)
 	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 +937,9 @@ command(void)
 		 * 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 +949,7 @@ command(void)
 		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 +1104,7 @@ command(void)
 		    (void) refresh();
 		    break;
 		}
+		__attribute__ ((fallthrough));
 		/* not set?  drops through to "default" */
 	default:			/* give them some help		*/
 		reset_prevshowwhich = 0;
diff -pruN 4.99.11-9/screen.h 4.99.12-1/screen.h
--- 4.99.11-9/screen.h	2005-07-19 12:59:51.000000000 +0000
+++ 4.99.12-1/screen.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/sgi.map.h 4.99.12-1/sgi.map.h
--- 4.99.11-9/sgi.map.h	2006-06-14 10:50:49.000000000 +0000
+++ 4.99.12-1/sgi.map.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/snoop.c 4.99.12-1/snoop.c
--- 4.99.11-9/snoop.c	2005-02-01 18:06:29.000000000 +0000
+++ 4.99.12-1/snoop.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: snoop.c,v 1.2 2005/02/01 18:06:29 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"
diff -pruN 4.99.11-9/ultrix.map.h 4.99.12-1/ultrix.map.h
--- 4.99.11-9/ultrix.map.h	2005-02-07 18:21:13.000000000 +0000
+++ 4.99.12-1/ultrix.map.h	2022-08-02 10:37:58.000000000 +0000
@@ -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 -pruN 4.99.11-9/util.c 4.99.12-1/util.c
--- 4.99.11-9/util.c	2009-02-01 23:33:37.000000000 +0000
+++ 4.99.12-1/util.c	2022-08-02 11:01:17.000000000 +0000
@@ -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 -pruN 4.99.11-9/xdr.c 4.99.12-1/xdr.c
--- 4.99.11-9/xdr.c	2006-06-14 10:50:49.000000000 +0000
+++ 4.99.12-1/xdr.c	2022-08-02 10:37:58.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * $Id: xdr.c,v 1.9 2006/06/14 10:50:49 c4chris Exp $
+ * $Id$
  */
 
 #include "os.h"