update to 20040310 version

changes:

- Added support for removing files recursivly
- Incudes checking for file type and size.
- Displays the file being destroyed and its size.
- Added command line flags:
- Added Security Level Flag (Destroy Severity)
- Added Output suppression flag for non-verbose output.
- Added Help flag.
- Added a Manual page for the program in section 1.

5 files changed, 16 insertions, 54 deletions

diff --git a/security/destroy/Makefile b/security/destroy/Makefile
index 56a0420471b..0e276d36c30 100644
--- a/security/destroy/Makefile
+++ b/security/destroy/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/23 18:11:29 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/03/12 18:01:57 recht Exp $
 #
 
-DISTNAME=	destroy-20030307
+DISTNAME=	destroy-20040310
 CATEGORIES=	security
 MASTER_SITES=	http://www.freebsdhackers.net/destroy/ \
-		http://www.killtech.org/destroy/
+		http://www.impurity.org/mirrors/destroy/
 
 MAINTAINER=	shane@freebsdhackers.net
 HOMEPAGE=	http://www.freebsdhackers.net/destroy/
-COMMENT=	Program to destroy files on the hard disk and unlink them
+COMMENT=	A program to securely destroy files on the hard disk
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/destroy ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/destroy.1 ${PREFIX}/man/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/destroy/PLIST b/security/destroy/PLIST
index 1c6270ac112..732d6c0bee9 100644
--- a/security/destroy/PLIST
+++ b/security/destroy/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/23 18:11:29 recht Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/12 18:01:57 recht Exp $
 bin/destroy
+man/man1/destroy.1
diff --git a/security/destroy/distinfo b/security/destroy/distinfo
index 8a2db46e09e..7b1803fd2b5 100644
--- a/security/destroy/distinfo
+++ b/security/destroy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/01/23 23:45:55 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/03/12 18:01:57 recht Exp $
 
-SHA1 (destroy-20030307.tar.gz) = a3a4e07f58b207cfc8d1b6110a40ad72762aaab4
-Size (destroy-20030307.tar.gz) = 2590 bytes
-SHA1 (patch-aa) = b70f9d6ea08d62767f5833adbf10c771be5a4148
-SHA1 (patch-ab) = 5793431abfb1705533ddc18bf3fa3dbce2cd43bc
+SHA1 (destroy-20040310.tar.gz) = 8ef3f0d41a59bef9a2e6b8ac4b5876dac585a377
+Size (destroy-20040310.tar.gz) = 3887 bytes
+SHA1 (patch-aa) = bb5a27f103cbf3224ea633f741a6777a345de938
+SHA1 (patch-ab) = 4df9db1acb75f68e431af20f7fb5139645db1939
diff --git a/security/destroy/patches/patch-aa b/security/destroy/patches/patch-aa
deleted file mode 100644
index a770e728425..00000000000
--- a/security/destroy/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/01/23 23:32:43 recht Exp $
-
---- Makefile.orig	2003-03-25 16:35:57.000000000 +0100
-+++ Makefile
-@@ -13,12 +13,12 @@ COMMENT=        A program to destroy fil
- 
- INSTALL=	/usr/bin/install -c -o root -g wheel
- CC?=		${CC}
--CFLAGS+=	-Wall -Werror
-+CFLAGS?=	${CFLAGS}
- RM?=		${RM}
- STRIP?=		${STRIP}
- 
- all:
--	${CC} -o ${PORTNAME} destroy.c
-+	${CC} ${CFLAGS} -o ${PORTNAME} destroy.c
- 
- install:
- 	${INSTALL} ${PORTNAME} ${LOCALBASE}/bin/
diff --git a/security/destroy/patches/patch-ab b/security/destroy/patches/patch-ab
deleted file mode 100644
index 4d53643e06a..00000000000
--- a/security/destroy/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/01/23 23:45:55 kristerw Exp $
-
---- destroy.c.orig	Tue Mar 25 16:56:34 2003
-+++ destroy.c	Sat Jan 24 00:38:44 2004
-@@ -58,6 +58,10 @@
- 	char		*buf;
- 	char		*devrand = "/dev/urandom";
- 	char		*devzero = "/dev/zero";
-+	int		mode = O_WRONLY | O_EXCL;
-+#if defined(O_NOFOLLOW)
-+	mode |=	O_NOFOLLOW;
-+#endif
- 
- 	if(argc < 2) {
- 		usage();
-@@ -90,7 +94,7 @@
- 		}
- 
- 		// Open our user file, and get a file descriptor for it
--		if((fd_userfile = open(filename, O_WRONLY | O_NOFOLLOW | O_EXCL)) < 0) {
-+		if((fd_userfile = open(filename, mode)) < 0) {
- 			fprintf(stderr, "Open Userfile Error!\n");
- 			usage();
- 			exit(1);