Imported new upstream release for gpgdir (1.9.4)

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@412 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/gpgdir/CREDITS b/gpgdir/CREDITS
index cacc582af0917f3530233a85c791e3b0ac0dc7af..4bc9a4d785b0b0089ef04ca4997939ff8fb814bb 100644 (file)
--- a/gpgdir/CREDITS
+++ b/gpgdir/CREDITS
@@ -47,3 +47,9 @@ Franck Joncourt
         http://lintian.debian.org/tags/manpage-has-bad-whatis-entry.html
     - Suggested the appropriate bugfix to interface non-interactively with the
       wipe program (-f instead of -I in later versions).
+
+Lars Wilke
+    - Reported a bug in missing the proper handling of files with spaces when
+      using the --Wipe secure deletion mode.
+    - Suggested the ability to encrypt/decrypt hidden files, and --Force now
+      supports this.

diff --git a/gpgdir/ChangeLog b/gpgdir/ChangeLog
index 2b29dfcccfb6e8454aa2306e7b7d92d39e01ec71..7fdbfd4dafe614e70e8880369a9176e99e316638 100644 (file)
--- a/gpgdir/ChangeLog
+++ b/gpgdir/ChangeLog
@@ -1,3 +1,9 @@
+gpgdir-1.9.4 (02/12/2009):
+    - Fixed a bug in missing the proper handling of files with spaces when
+      using the --Wipe secure deletion mode (reported by Lars Wilke).
+    - The --Force option now supports the ability to encrypt/decrypt hidden
+      files (suggested by Lars Wilke).
+
 gpgdir-1.9.3 (11/05/2008):
     - Bugfix for using -f instead of -I for non-interactive file erasure
       (Franck Joncourt).

diff --git a/gpgdir/ChangeLog.svn b/gpgdir/ChangeLog.svn
index 4c2abc056cefa27db9222ec2bcde171608d9b9e0..09509b16be4d46a5a7d023f51644f45cb52a70e4 100644 (file)
--- a/gpgdir/ChangeLog.svn
+++ b/gpgdir/ChangeLog.svn
@@ -1,11 +1,11 @@
 ------------------------------------------------------------------------
-r329 | mbr | 2008-11-05 00:12:52 -0500 (Wed, 05 Nov 2008) | 1 line
+r336 | mbr | 2009-02-14 00:09:07 -0500 (Sat, 14 Feb 2009) | 1 line
 Changed paths:
-   A /gpgdir/branches/gpgdir-1.9.3 (from /gpgdir/trunk:328)
+   A /gpgdir/branches/gpgdir-1.9.4 (from /gpgdir/trunk:335)
 
-created gpgdir-1.9.3 branch
+created gpgdir-1.9.4 branch
 ------------------------------------------------------------------------
-r328 | mbr | 2008-11-05 00:04:20 -0500 (Wed, 05 Nov 2008) | 1 line
+r335 | mbr | 2009-02-12 23:48:54 -0500 (Thu, 12 Feb 2009) | 1 line
 Changed paths:
    M /gpgdir/trunk/ChangeLog
    M /gpgdir/trunk/VERSION
@@ -14,52 +14,29 @@ Changed paths:
    M /gpgdir/trunk/packaging/gpgdir.spec
    M /gpgdir/trunk/test/gpgdir_test.pl
 
-1.9.3 release
+version 1.9.4
 ------------------------------------------------------------------------
-r326 | mbr | 2008-10-13 21:55:56 -0400 (Mon, 13 Oct 2008) | 1 line
+r333 | mbr | 2008-11-09 15:23:13 -0500 (Sun, 09 Nov 2008) | 1 line
 Changed paths:
    M /gpgdir/trunk/VERSION
    M /gpgdir/trunk/gpgdir
    M /gpgdir/trunk/test/gpgdir_test.pl
 
-bumped version to 1.9.3-pre1
+tagged gpgdir-1.9.4-pre1
 ------------------------------------------------------------------------
-r325 | mbr | 2008-10-03 00:04:46 -0400 (Fri, 03 Oct 2008) | 3 lines
+r332 | mbr | 2008-11-09 15:22:46 -0500 (Sun, 09 Nov 2008) | 5 lines
 Changed paths:
    M /gpgdir/trunk/CREDITS
    M /gpgdir/trunk/ChangeLog
    M /gpgdir/trunk/gpgdir
+   A /gpgdir/trunk/test/data-dir/files_with_spaces
+   A /gpgdir/trunk/test/data-dir/files_with_spaces/file1 space1
+   A /gpgdir/trunk/test/data-dir/files_with_spaces/file2  space2
+   A /gpgdir/trunk/test/data-dir/files_with_spaces/file3 -dash
 
-- Bugfix for using -f instead of -I for non-interactive file erasure
-(Franck Joncourt).
+- Fixed a bug in missing the proper handling of files with spaces when
+using the --Wipe secure deletion mode (reported by Lars Wilke).
+- The --Force option now supports the ability to encrypt/decrypt hidden
+files (suggested by Lars Wilke).
 
 ------------------------------------------------------------------------
-r324 | mbr | 2008-10-02 23:57:33 -0400 (Thu, 02 Oct 2008) | 1 line
-Changed paths:
-   M /gpgdir/trunk/ChangeLog
-
-minor date update
-------------------------------------------------------------------------
-r323 | mbr | 2008-10-02 23:57:11 -0400 (Thu, 02 Oct 2008) | 3 lines
-Changed paths:
-   M /gpgdir/trunk/ChangeLog
-   M /gpgdir/trunk/gpgdir
-   M /gpgdir/trunk/test/gpgdir_test.pl
-
-Simplified test suite code by creating a set of default arguments for
-the gpgdir command line as each test is executed
-
-------------------------------------------------------------------------
-r322 | mbr | 2008-09-10 23:40:35 -0400 (Wed, 10 Sep 2008) | 1 line
-Changed paths:
-   M /gpgdir/trunk/CREDITS
-   M /gpgdir/trunk/gpgdir.1
-
-applied gpgdir man page fix from Franck
-------------------------------------------------------------------------
-r321 | mbr | 2008-09-01 00:24:35 -0400 (Mon, 01 Sep 2008) | 1 line
-Changed paths:
-   M /gpgdir/trunk/gpgdir
-
-merged in 'signed' vs. 'verified' text fix
-------------------------------------------------------------------------

diff --git a/gpgdir/VERSION b/gpgdir/VERSION
index 77fee73a8cf94e4af1b19dc7787d1c48c7d2063f..d615fd0c04ab484eefb407226dab9dd0a922b6c9 100644 (file)
--- a/gpgdir/VERSION
+++ b/gpgdir/VERSION
@@ -1 +1 @@
-1.9.3
+1.9.4

diff --git a/gpgdir/gpgdir b/gpgdir/gpgdir
index 0075215e9cabcbeabfab826d3f6fc8d076da3a1c..947d3c7034730c5ef2a69465e8ab9ea4e4fa44f6 100755 (executable)
--- a/gpgdir/gpgdir
+++ b/gpgdir/gpgdir
@@ -10,7 +10,7 @@
 #
 # Author: Michael Rash (mbr@cipherdyne.com)
 #
-# Version: 1.9.3
+# Version: 1.9.4
 #
 # Copyright (C) 2002-2008 Michael Rash (mbr@cipherdyne.org)
 #
@@ -28,7 +28,7 @@
 #
 ###########################################################################
 #
-# $Id: gpgdir 328 2008-11-05 05:04:20Z mbr $
+# $Id: gpgdir 335 2009-02-13 04:48:54Z mbr $
 #
 
 use File::Find;
@@ -40,8 +40,8 @@ use Cwd;
 use strict;
 
 ### set the current gpgdir version and file revision numbers
-my $version = '1.9.3';
-my $revision_svn = '$Revision: 328 $';
+my $version = '1.9.4';
+my $revision_svn = '$Revision: 335 $';
 my $rev_num = '1';
 ($rev_num) = $revision_svn =~ m|\$Rev.*:\s+(\S+)|;
 
@@ -666,7 +666,7 @@ sub delete_file() {
                 $cmd .= ' -f -s ';
             }
         }
-        $cmd .= $file;
+        $cmd .= qq|"$file"|;
         if ($verbose) {
             print "    Executing: $cmd\n";
         }
@@ -1166,10 +1166,19 @@ sub find_files() {
 sub check_file_criteria() {
     my $file = shift;
     ### skip all links, zero size files, all hidden
-    ### files (includes .gnupg files), etc.
+    ### files (includes the .gnupg directory), etc.
     return if -d $file;
+
+    unless ($force_mode) {
+        if ($file =~ m|/\.|) {
+            print "[-] Skipping file: $file\n"
+                if $verbose and not $quiet;
+            return;
+        }
+    }
+
     if (-e $file and not -l $file and -s $file != 0
-            and $file !~ m|/\.|) {
+            and $file !~ m|\.gpgdir\.pid| and $file !~ m|\.gnupg|) {
         if ($encrypt_mode or $signing_mode) {
             if ($file =~ m|\.gpg| or $file =~ m|\.asc|) {
                 print "[-] Skipping encrypted/signed file: $file\n" unless $quiet;

diff --git a/gpgdir/packaging/gpgdir-nodeps.spec b/gpgdir/packaging/gpgdir-nodeps.spec
index 148e60604aed69f92d26ae94b46eb6696549e43b..11186a2fd31639bb575c1024e736807c9c7f35c3 100644 (file)
--- a/gpgdir/packaging/gpgdir-nodeps.spec
+++ b/gpgdir/packaging/gpgdir-nodeps.spec
@@ -1,5 +1,5 @@
 %define name gpgdir
-%define version 1.9.3
+%define version 1.9.4
 %define release 1
 %define gpgdirlibdir %_libdir/%name
 
@@ -58,6 +58,9 @@ install -m 644 gpgdir.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 %_libdir/%name
 
 %changelog
+* Thu Feb 12 2009 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9.4 release
+
 * Wed Nov 11 2008 Michael Rash <mbr@cipherdyne.org>
 - gpgdir-1.9.3 release
 

diff --git a/gpgdir/packaging/gpgdir.spec b/gpgdir/packaging/gpgdir.spec
index 5af2887842ec732fd8093b831f12028fb5da461c..d446670d7c19b6919c6fde9d49a546f748339868 100644 (file)
--- a/gpgdir/packaging/gpgdir.spec
+++ b/gpgdir/packaging/gpgdir.spec
@@ -1,5 +1,5 @@
 %define name gpgdir
-%define version 1.9.3
+%define version 1.9.4
 %define release 1
 %define gpgdirlibdir %_libdir/%name
 
@@ -115,6 +115,9 @@ cd ..
 %_libdir/%name
 
 %changelog
+* Thu Feb 12 2009 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9.4 release
+
 * Wed Nov 11 2008 Michael Rash <mbr@cipherdyne.org>
 - gpgdir-1.9.3 release
 

diff --git a/gpgdir/test/data-dir/files_with_spaces/file1 space1 b/gpgdir/test/data-dir/files_with_spaces/file1 space1
new file mode 100644 (file)
index 0000000..4c535fe
--- /dev/null
+++ b/gpgdir/test/data-dir/files_with_spaces/file1 space1
@@ -0,0 +1 @@
+one space in filename

diff --git a/gpgdir/test/data-dir/files_with_spaces/file2  space2 b/gpgdir/test/data-dir/files_with_spaces/file2  space2
new file mode 100644 (file)
index 0000000..81e593f
--- /dev/null
+++ b/gpgdir/test/data-dir/files_with_spaces/file2  space2
@@ -0,0 +1 @@
+two spaces in filename

diff --git a/gpgdir/test/data-dir/files_with_spaces/file3 -dash b/gpgdir/test/data-dir/files_with_spaces/file3 -dash
new file mode 100644 (file)
index 0000000..4c3c298
--- /dev/null
+++ b/gpgdir/test/data-dir/files_with_spaces/file3 -dash
@@ -0,0 +1 @@
+space and dash

diff --git a/gpgdir/test/gpgdir_test.pl b/gpgdir/test/gpgdir_test.pl
index fafda65ca41ed1cb137995bc4c7193681511179c..0d851678a7b4a0d9fbb9bdded2b4dee77ce21870 100755 (executable)
--- a/gpgdir/test/gpgdir_test.pl
+++ b/gpgdir/test/gpgdir_test.pl
@@ -9,7 +9,7 @@
 #
 # Author: Michael Rash (mbr@cipherdyne.org)
 #
-# Version: 1.9.3
+# Version: 1.9.4
 #
 # Copyright (C) 2008 Michael Rash (mbr@cipherdyne.org)
 #
@@ -27,7 +27,7 @@
 #
 #############################################################################
 #
-# $Id: gpgdir_test.pl 328 2008-11-05 05:04:20Z mbr $
+# $Id: gpgdir_test.pl 335 2009-02-13 04:48:54Z mbr $
 #
 
 use Digest::MD5 'md5_base64';