(sysutils/wip) Updated 2.2.0 to 2.3.1

2.3.1:
fixed Makefile bug! Running make uninstall removed target bin directory.

2.3:

DEFAULTS!
the default is now one single random pass  <-- MAJOR CHANGE
special files are no longer deleted by default

support for wiping char devices, such as tape drives

percentage reporting improved (thanks to Jason Tackaberry for patch)

cleanup and exit upon SIGINT

each wiped file prints on a seperate line

skip unnecessary fdatasync()s, unless you want the extra accuracy on the % shown (-e option)

call fsync() on the file after name wipe, in addition to fsync on the directory

if fdatasync() fails, try for O_SYNC and only complain once per file

fixed some off-by-ones
fixed percentages for non-static wipes

2.2.1:
added largefile support for linux and solaris (tested on linux)

fixed drill_down(). it was using the wrong length to null term the string

9 files changed, 56 insertions, 36 deletions

diff --git a/sysutils/wipe/Makefile b/sysutils/wipe/Makefile
index c453d2135f1..ed034ca8da9 100644
--- a/sysutils/wipe/Makefile
+++ b/sysutils/wipe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/02/26 10:24:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2019/11/16 10:14:15 mef Exp $
 #
 
-DISTNAME=		wipe-2.2.0
+DISTNAME=		wipe-2.3.1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wipe/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/wipe/distinfo b/sysutils/wipe/distinfo
index 5660fb676e4..f64867a6aee 100644
--- a/sysutils/wipe/distinfo
+++ b/sysutils/wipe/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:32:38 agc Exp $
+$NetBSD: distinfo,v 1.9 2019/11/16 10:14:15 mef Exp $
 
-SHA1 (wipe-2.2.0.tar.bz2) = 4dd18f260ecd91b726336b2788fa33db04d6691a
-RMD160 (wipe-2.2.0.tar.bz2) = 5d1861bd893e01e94205a7ac2efadb1c756da700
-SHA512 (wipe-2.2.0.tar.bz2) = 5d156712b07b579018324b714dad2d3fae3c3cac1a9b1fd76ec44596b9d738bb3e460dedf23898e12ed87ee5dced28d1792c905c9869756914e21ad95efbbbbb
-Size (wipe-2.2.0.tar.bz2) = 70134 bytes
-SHA1 (patch-aa) = 4d84f400528b88f376a374f159b72da4237f3b33
-SHA1 (patch-ab) = 3116ad02dd0a3514afec440e46ab679395e4bbaa
-SHA1 (patch-ac) = df59d51a7ee781fd439db1bf2284fb34e26fb8fb
-SHA1 (patch-ad) = 6288118d9b4a70844bbc94a8e9dc4748fc9459f8
-SHA1 (patch-ae) = e1145c395a9b0999d7fbf8a4cb79f1dc89aa29e1
-SHA1 (patch-af) = 23102dea6f821791d5b3bd2bb509c38ab6bf2a16
-SHA1 (patch-ag) = fd61d6b065eb22cabb697f2df073a3b9efde26a9
+SHA1 (wipe-2.3.1.tar.bz2) = 72aa8bcbeb54deb676ae08af78401132860703de
+RMD160 (wipe-2.3.1.tar.bz2) = 313c140a2ea6f2c81a0b4d90974c8581ba0b14db
+SHA512 (wipe-2.3.1.tar.bz2) = 63870e68fa5dbf90abb686052f8dcc216ccb93b0c4f5cc10d60ccf43f3606ba91b46dc1e3d8b34d201f7ea657f70b45a61d5d04facf5b2a3e47d2286c46e7110
+Size (wipe-2.3.1.tar.bz2) = 72297 bytes
+SHA1 (patch-aa) = d4045fb2cfb620f0cbf7f5b767b42805389875a5
+SHA1 (patch-ab) = c870f718cbba7e633dd2a2e6e6da20d2dd942c26
+SHA1 (patch-ac) = 742517caf37193a254245685d5d7cd990caab7a5
+SHA1 (patch-ad) = 8867747f6e91d28e507de3b24c9436e3756d3652
+SHA1 (patch-ae) = 9785777c93b3c2fb357fcca4ba73f2f5bf5a8329
+SHA1 (patch-af) = 98c17d8fcb00b2e4327294dd26b367b874eacfe2
+SHA1 (patch-ag) = 1c2944e07724c27abbd4c966822159e649ac786a
 SHA1 (patch-ah) = 362b9f59453baa4d8632d895a2f3a530ba9ca652
diff --git a/sysutils/wipe/patches/patch-aa b/sysutils/wipe/patches/patch-aa
index f24beb175d1..d07ba9b9357 100644
--- a/sysutils/wipe/patches/patch-aa
+++ b/sysutils/wipe/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2010/01/27 20:37:48 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2019/11/16 10:14:15 mef Exp $
+
+INSTALL_BIN -> BSD_INSTALL_PROGRAM etc
 
 --- Makefile.in.orig	2003-08-30 20:18:03.000000000 -0500
 +++ Makefile.in
diff --git a/sysutils/wipe/patches/patch-ab b/sysutils/wipe/patches/patch-ab
index 728d42adb90..8300da7b7c3 100644
--- a/sysutils/wipe/patches/patch-ab
+++ b/sysutils/wipe/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2019/11/16 10:14:15 mef Exp $
 
---- main.c.orig	2005-11-10 16:11:18.000000000 +0000
-+++ main.c
-@@ -49,8 +49,6 @@
+date: 2005-11-11 01:31:25 +0900;  author: joerg;  state: Exp;
+Depend on errno.h for errno.
+
+--- main.c.orig	2009-06-15 12:53:53.000000000 +0900
++++ main.c	2019-11-16 19:00:22.708537629 +0900
+@@ -52,8 +52,6 @@
  char *argvzero;
  int exit_code;
  
 -extern int errno;
 -
  struct opt_s options;                 /* cmd line options                        */
- 
- public int main(int argc, char **argv)
+ struct rename_s rns;
+ struct sigaction sigact;
diff --git a/sysutils/wipe/patches/patch-ac b/sysutils/wipe/patches/patch-ac
index 87d02d48d62..b3e3949d425 100644
--- a/sysutils/wipe/patches/patch-ac
+++ b/sysutils/wipe/patches/patch-ac
@@ -1,12 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2019/11/16 10:14:15 mef Exp $
 
---- wipe.c.orig	2005-11-10 16:11:51.000000000 +0000
-+++ wipe.c
-@@ -55,7 +55,6 @@
+date: 2005-11-11 01:31:25 +0900;  author: joerg;  state: Exp;
+Depend on errno.h for errno.
+
+--- wipe.c.orig	2009-06-15 12:07:00.000000000 +0900
++++ wipe.c	2019-11-16 19:01:20.812061117 +0900
+@@ -56,7 +56,6 @@
  #include "rand.h"
  #include "wipe.h"
  
 -extern int errno;
  extern int exit_code;
  extern char *argvzero;
- extern struct opt_s options;
+ extern struct rename_s rns;
diff --git a/sysutils/wipe/patches/patch-ad b/sysutils/wipe/patches/patch-ad
index 5bdad267d5b..8a1c1180f87 100644
--- a/sysutils/wipe/patches/patch-ad
+++ b/sysutils/wipe/patches/patch-ad
@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2019/11/16 10:14:15 mef Exp $
+
+date: 2005-11-11 01:31:25 +0900;  author: joerg;  state: Exp;
+Depend on errno.h for errno.
 
 --- rand.c.orig	2005-11-10 16:13:03.000000000 +0000
 +++ rand.c
diff --git a/sysutils/wipe/patches/patch-ae b/sysutils/wipe/patches/patch-ae
index e376f9046c1..f2d3cbaab4e 100644
--- a/sysutils/wipe/patches/patch-ae
+++ b/sysutils/wipe/patches/patch-ae
@@ -1,7 +1,10 @@
-$NetBSD: patch-ae,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2019/11/16 10:14:15 mef Exp $
 
---- dir.c.orig	2005-11-10 16:13:27.000000000 +0000
-+++ dir.c
+date: 2005-11-11 01:31:25 +0900;  author: joerg;  state: Exp;
+Depend on errno.h for errno.
+
+--- dir.c.orig	2009-06-16 11:38:20.000000000 +0900
++++ dir.c	2019-11-16 19:10:59.620534303 +0900
 @@ -46,7 +46,6 @@
  #include "io.h"
  #include "dir.h"
@@ -9,4 +12,4 @@ $NetBSD: patch-ae,v 1.1 2005/11/10 16:31:25 joerg Exp $
 -extern int errno;
  extern int exit_code;
  extern char *argvzero;
- extern struct opt_s options;
+ extern struct rename_s rns;
diff --git a/sysutils/wipe/patches/patch-af b/sysutils/wipe/patches/patch-af
index 55a8c61e91a..30bb961c339 100644
--- a/sysutils/wipe/patches/patch-af
+++ b/sysutils/wipe/patches/patch-af
@@ -1,7 +1,10 @@
-$NetBSD: patch-af,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-af,v 1.2 2019/11/16 10:14:15 mef Exp $
 
---- file.c.orig	2005-11-10 16:13:33.000000000 +0000
-+++ file.c
+date: 2005-11-11 01:31:25 +0900;  author: joerg;  state: Exp;
+Depend on errno.h for errno.
+ 
+--- file.c.orig	2009-05-04 14:05:42.000000000 +0900
++++ file.c	2019-11-16 19:04:00.588624480 +0900
 @@ -43,7 +43,6 @@
  #include "prompt.h"
  #include "wipe.h"
@@ -9,4 +12,4 @@ $NetBSD: patch-af,v 1.1 2005/11/10 16:31:25 joerg Exp $
 -extern int errno;
  extern int exit_code;
  extern char *argvzero;
- 
+ extern struct rename_s rns;
diff --git a/sysutils/wipe/patches/patch-ag b/sysutils/wipe/patches/patch-ag
index 26aa0b7bf63..bae1391415c 100644
--- a/sysutils/wipe/patches/patch-ag
+++ b/sysutils/wipe/patches/patch-ag
@@ -1,4 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2005/11/10 16:31:25 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2019/11/16 10:14:15 mef Exp $
+
+date: 2005-11-11 01:31:25 +0900;  author: joerg;  state: Exp;
+Depend on errno.h for errno.
 
 --- io.c.orig	2005-11-10 16:13:36.000000000 +0000
 +++ io.c