Imported new upstream release for gpgdir.

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

diff --git a/debian/changelog b/debian/changelog
index 63febc22232ddf920371d453766d5c3d441cef2a..2a244bfde5caad1ec3423bf044de7d61ec9d90c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 signing-party (1.1.1-2) UNRELEASED; urgency=low
 
 signing-party (1.1.1-2) UNRELEASED; urgency=low
 

+  TODOs:
+  * Check for Debian policy 3.8.3
+

   [ Franck Joncourt ]
   * gpgsigs: 
     + Added patch from Roland Rosenfeld to support RIPEMD160 checksum.
   [ Franck Joncourt ]
   * gpgsigs: 
     + Added patch from Roland Rosenfeld to support RIPEMD160 checksum.


@@ -15,6 +18,7 @@ signing-party (1.1.1-2) UNRELEASED; urgency=low
     + Moved the current check to a new function get_local_user_keys().
     + Warned the user if a local-user keyid is not listed as a keyid in
       ./caffrc. (Closes: #540165).
     + Moved the current check to a new function get_local_user_keys().
     + Warned the user if a local-user keyid is not listed as a keyid in
       ./caffrc. (Closes: #540165).

+  * gpgdir: New upstream release.

 
   * Bumped Standards-Version up to 3.8.2 (no changes).
 
 
   * Bumped Standards-Version up to 3.8.2 (no changes).
 

diff --git a/gpgdir/ChangeLog b/gpgdir/ChangeLog
index 7fdbfd4dafe614e70e8880369a9176e99e316638..d1c458c5fd9348a336eec76570a044c8fc5538e7 100644 (file)
--- a/gpgdir/ChangeLog
+++ b/gpgdir/ChangeLog
@@ -1,3 +1,7 @@
+gpgdir-1.9.5 (09/05/2009):
+    - Added support for the decryption of PGP encrypted files (to round out
+      the support of GnuPG).
+

 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).
 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).

diff --git a/gpgdir/ChangeLog.svn b/gpgdir/ChangeLog.svn
index 09509b16be4d46a5a7d023f51644f45cb52a70e4..3f765ce887a2ecaf2fbebbf1948e5dab7f7b8cb7 100644 (file)
--- a/gpgdir/ChangeLog.svn
+++ b/gpgdir/ChangeLog.svn
@@ -1,42 +1,61 @@
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

-r336 | mbr | 2009-02-14 00:09:07 -0500 (Sat, 14 Feb 2009) | 1 line
+r349 | mbr | 2009-09-05 14:52:04 -0400 (Sat, 05 Sep 2009) | 1 line

 Changed paths:
 Changed paths:

-   A /gpgdir/branches/gpgdir-1.9.4 (from /gpgdir/trunk:335)
+   A /gpgdir/branches/gpgdir-1.9.5 (from /gpgdir/trunk:348)

 
 

-created gpgdir-1.9.4 branch
+recreated gpgdir-1.9.5 branch

 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

-r335 | mbr | 2009-02-12 23:48:54 -0500 (Thu, 12 Feb 2009) | 1 line
+r347 | mbr | 2009-09-05 14:50:48 -0400 (Sat, 05 Sep 2009) | 10 lines
+Changed paths:
+   A /gpgdir/trunk/packaging/gpgdir-nobuildreqs.spec
+   M /gpgdir/trunk/packaging/gpgdir.spec
+
+For all RPM's built on the local system (Ubuntu for now), updated to reference the
+"-nobuildreqs.spec" file so that the "BuildRequires: perl-ExtUtils-MakeMaker" directive
+is not used.  Using this results in the following error on an Ubuntu system where no
+software is installed/upgrade with RPM:
+
+rpm: To install rpm packages on Debian systems, use alien. See README.Debian.
+error: cannot open Packages index using db3 - No such file or directory (2)
+error: cannot open Packages database in /var/lib/rpm
+
+
+------------------------------------------------------------------------
+r344 | mbr | 2009-09-05 14:28:24 -0400 (Sat, 05 Sep 2009) | 1 line

 Changed paths:
 Changed paths:

-   M /gpgdir/trunk/ChangeLog
-   M /gpgdir/trunk/VERSION
-   M /gpgdir/trunk/gpgdir

    M /gpgdir/trunk/packaging/gpgdir-nodeps.spec
    M /gpgdir/trunk/packaging/gpgdir.spec
    M /gpgdir/trunk/packaging/gpgdir-nodeps.spec
    M /gpgdir/trunk/packaging/gpgdir.spec

+
+updated to include 1.9.5 release
+------------------------------------------------------------------------
+r342 | mbr | 2009-09-05 14:24:38 -0400 (Sat, 05 Sep 2009) | 1 line
+Changed paths:
+   M /gpgdir/trunk/ChangeLog
+
+updated 1.9.5 release date
+------------------------------------------------------------------------
+r341 | mbr | 2009-08-25 22:43:51 -0400 (Tue, 25 Aug 2009) | 1 line
+Changed paths:
+   M /gpgdir/trunk/gpgdir

    M /gpgdir/trunk/test/gpgdir_test.pl
 
    M /gpgdir/trunk/test/gpgdir_test.pl
 

-version 1.9.4
+minor copyright update

 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

-r333 | mbr | 2008-11-09 15:23:13 -0500 (Sun, 09 Nov 2008) | 1 line
+r340 | mbr | 2009-08-23 14:32:29 -0400 (Sun, 23 Aug 2009) | 1 line

 Changed paths:
    M /gpgdir/trunk/VERSION
    M /gpgdir/trunk/gpgdir
    M /gpgdir/trunk/test/gpgdir_test.pl
 
 Changed paths:
    M /gpgdir/trunk/VERSION
    M /gpgdir/trunk/gpgdir
    M /gpgdir/trunk/test/gpgdir_test.pl
 

-tagged gpgdir-1.9.4-pre1
+bumped version to 1.9.5

 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

-r332 | mbr | 2008-11-09 15:22:46 -0500 (Sun, 09 Nov 2008) | 5 lines
+r339 | mbr | 2009-08-23 14:31:48 -0400 (Sun, 23 Aug 2009) | 3 lines

 Changed paths:
 Changed paths:

-   M /gpgdir/trunk/CREDITS

    M /gpgdir/trunk/ChangeLog
    M /gpgdir/trunk/gpgdir
    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
-
-- 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).
+   M /gpgdir/trunk/test/gpgdir_test.pl
+
+- Added support for the decryption of PGP encrypted files (to round out 
+the support of GnuPG).

 
 ------------------------------------------------------------------------
 
 ------------------------------------------------------------------------

diff --git a/gpgdir/VERSION b/gpgdir/VERSION
index d615fd0c04ab484eefb407226dab9dd0a922b6c9..158c7472933624f9c336319cc85f9d2fc2bb6e82 100644 (file)
--- a/gpgdir/VERSION
+++ b/gpgdir/VERSION
@@ -1 +1 @@
-1.9.4
+1.9.5

diff --git a/gpgdir/gpgdir b/gpgdir/gpgdir
index 947d3c7034730c5ef2a69465e8ab9ea4e4fa44f6..b6d811847ed2a159d21f6b024d2d53bb8beb4f69 100755 (executable)
--- a/gpgdir/gpgdir
+++ b/gpgdir/gpgdir
@@ -10,9 +10,9 @@
 #
 # Author: Michael Rash (mbr@cipherdyne.com)
 #
 #
 # Author: Michael Rash (mbr@cipherdyne.com)
 #

-# Version: 1.9.4
+# Version: 1.9.5

 #
 #

-# Copyright (C) 2002-2008 Michael Rash (mbr@cipherdyne.org)
+# Copyright (C) 2002-2009 Michael Rash (mbr@cipherdyne.org)

 #
 # License: GNU General Public License version 2 (GPLv2)
 #
 #
 # License: GNU General Public License version 2 (GPLv2)
 #


@@ -28,7 +28,7 @@
 #
 ###########################################################################
 #
 #
 ###########################################################################
 #

-# $Id: gpgdir 335 2009-02-13 04:48:54Z mbr $
+# $Id: gpgdir 341 2009-08-26 02:43:51Z mbr $

 #
 
 use File::Find;
 #
 
 use File::Find;


@@ -40,8 +40,8 @@ use Cwd;
 use strict;
 
 ### set the current gpgdir version and file revision numbers
 use strict;
 
 ### set the current gpgdir version and file revision numbers

-my $version = '1.9.4';
-my $revision_svn = '$Revision: 335 $';
+my $version = '1.9.5';
+my $revision_svn = '$Revision: 341 $';

 my $rev_num = '1';
 ($rev_num) = $revision_svn =~ m|\$Rev.*:\s+(\S+)|;
 
 my $rev_num = '1';
 ($rev_num) = $revision_svn =~ m|\$Rev.*:\s+(\S+)|;
 


@@ -817,6 +817,8 @@ sub gpg_operation() {
                 $decrypt_filename = $1;
             } elsif ($filename =~ /^(.+)\.asc$/) {
                 $decrypt_filename = $1;
                 $decrypt_filename = $1;
             } elsif ($filename =~ /^(.+)\.asc$/) {
                 $decrypt_filename = $1;

+            } elsif ($filename =~ /^(.+)\.pgp$/) {
+                $decrypt_filename = $1;

             }
 
             if ($obfuscate_mode) {
             }
 
             if ($obfuscate_mode) {


@@ -1180,7 +1182,7 @@ sub check_file_criteria() {
     if (-e $file and not -l $file and -s $file != 0
             and $file !~ m|\.gpgdir\.pid| and $file !~ m|\.gnupg|) {
         if ($encrypt_mode or $signing_mode) {
     if (-e $file and not -l $file and -s $file != 0
             and $file !~ m|\.gpgdir\.pid| and $file !~ m|\.gnupg|) {
         if ($encrypt_mode or $signing_mode) {

-            if ($file =~ m|\.gpg| or $file =~ m|\.asc|) {
+            if ($file =~ m|\.gpg| or $file =~ m|\.asc| or $file =~ m|\.pgp|) {

                 print "[-] Skipping encrypted/signed file: $file\n" unless $quiet;
                 return;
             }
                 print "[-] Skipping encrypted/signed file: $file\n" unless $quiet;
                 return;
             }


@@ -1190,7 +1192,8 @@ sub check_file_criteria() {
                 return;
             }
         } else {
                 return;
             }
         } else {

-            unless ($file =~ m|\.gpg| or $file =~ m|\.asc|) {
+            unless ($file =~ m|\.gpg| or $file =~ m|\.asc|
+                    or $file =~ m|\.pgp|) {

                 print "[-] Skipping unencrypted file: $file\n" unless $quiet;
                 return;
             }
                 print "[-] Skipping unencrypted file: $file\n" unless $quiet;
                 return;
             }

diff --git a/gpgdir/packaging/gpgdir-nobuildreqs.spec b/gpgdir/packaging/gpgdir-nobuildreqs.spec
new file mode 100644 (file)
index 0000000..3deb539
--- /dev/null
+++ b/gpgdir/packaging/gpgdir-nobuildreqs.spec
@@ -0,0 +1,173 @@
+%define name gpgdir
+%define version 1.9.5
+%define release 1
+%define gpgdirlibdir %_libdir/%name
+
+### get the first @INC directory that includes the string "linux".
+### This may be 'i386-linux', or 'i686-linux-thread-multi', etc.
+%define gpgdirmoddir `perl -e '$path='i386-linux'; for (@INC) { if($_ =~ m|.*/(.*linux.*)|) {$path = $1; last; }} print $path'`
+
+Summary: Gpgdir recursively encrypts/decrypts directories with GnuPG.
+Name: %name
+Version: %version
+Release: %release
+License: GPL
+Group: Applications/Cryptography
+Url: http://www.cipherdyne.org/gpgdir/
+Source: %name-%version.tar.gz
+BuildRoot: %_tmppath/%{name}-buildroot
+#Prereq: rpm-helper
+
+%description
+gpgdir is a perl script that uses the CPAN GnuPG::Interface perl module to encrypt
+and decrypt directories using a gpg key specified in ~/.gpgdirrc. gpgdir recursively
+descends through a directory in order to make sure it encrypts or decrypts every file
+in a directory and all of its subdirectories. By default the mtime and atime values
+of all files will be preserved upon encryption and decryption (this can be disabled
+with the --no-preserve-times option). Note that in --encrypt mode, gpgdir will
+delete the original files that it successfully encrypts (unless the --no-delete
+option is given). However, upon startup gpgdir first asks for a the decryption pass-
+word to be sure that a dummy file can successfully be encrypted and decrypted. The
+initial test can be disabled with the --skip-test option so that a directory can eas-
+ily be encrypted without having to also specify a password (this is consistent with
+gpg behavior). Also, note that gpgdir is careful not encrypt hidden files and direc-
+tories. After all, you probably don't want your ~/.gnupg directory or ~/.bashrc file
+to be encrypted.
+
+%prep
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%setup -q
+for i in $(grep -r "use lib" . | cut -d: -f1); do
+    awk '/use lib/ { sub("/usr/lib/gpgdir", "%_libdir/%name") } { print }' $i > $i.tmp
+    mv $i.tmp $i
+done
+
+cd deps
+cd Class-MethodMaker && perl Makefile.PL PREFIX=%gpgdirlibdir LIB=%gpgdirlibdir
+cd ..
+cd GnuPG-Interface && perl Makefile.PL PREFIX=%gpgdirlibdir LIB=%gpgdirlibdir
+cd ..
+cd TermReadKey && perl Makefile.PL PREFIX=%gpgdirlibdir LIB=%gpgdirlibdir
+cd ../..
+
+%build
+
+### build perl modules used by gpgdir
+cd deps
+make OPTS="$RPM_OPT_FLAGS" -C Class-MethodMaker
+make OPTS="$RPM_OPT_FLAGS" -C GnuPG-Interface
+make OPTS="$RPM_OPT_FLAGS" -C TermReadKey
+cd ..
+
+%install
+
+### gpgdir module dirs
+cd deps
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Term/ReadKey
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/array
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/Engine
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/hash
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/scalar
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/Class/MethodMaker
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/Term
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/auto/GnuPG/Interface
+mkdir -p $RPM_BUILD_ROOT%gpgdirlibdir/GnuPG
+mkdir -p $RPM_BUILD_ROOT%_bindir
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p $RPM_BUILD_ROOT%_sbindir
+cd ..
+
+install -m 755 gpgdir $RPM_BUILD_ROOT%_bindir/
+install -m 644 gpgdir.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+
+### install perl modules used by gpgdir
+cd deps
+install -m 444 Class-MethodMaker/blib/lib/auto/Class/MethodMaker/array/*.* $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/array/
+install -m 444 Class-MethodMaker/blib/lib/auto/Class/MethodMaker/scalar/*.* $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/scalar/
+install -m 444 Class-MethodMaker/blib/lib/auto/Class/MethodMaker/hash/*.* $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/hash/
+install -m 444 Class-MethodMaker/blib/lib/auto/Class/MethodMaker/Engine/*.* $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/Engine/
+install -m 444 Class-MethodMaker/blib/arch/auto/Class/MethodMaker/MethodMaker.bs $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/MethodMaker.bs
+install -m 444 Class-MethodMaker/blib/arch/auto/Class/MethodMaker/MethodMaker.so $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Class/MethodMaker/MethodMaker.so
+install -m 444 Class-MethodMaker/blib/lib/Class/MethodMaker.pm $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/Class/MethodMaker.pm
+install -m 444 Class-MethodMaker/blib/lib/Class/MethodMaker/*.pm $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/Class/MethodMaker
+install -m 444 GnuPG-Interface/blib/lib/auto/GnuPG/Interface/*.* $RPM_BUILD_ROOT%gpgdirlibdir/auto/GnuPG/Interface/
+install -m 444 GnuPG-Interface/blib/lib/GnuPG/*.pm $RPM_BUILD_ROOT%gpgdirlibdir/GnuPG/
+install -m 444 TermReadKey/blib/lib/Term/ReadKey.pm $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/Term/ReadKey.pm
+install -m 444 TermReadKey/blib/lib/auto/Term/ReadKey/autosplit.ix $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Term/ReadKey/autosplit.ix
+install -m 444 TermReadKey/blib/arch/auto/Term/ReadKey/ReadKey.bs $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Term/ReadKey/ReadKey.bs
+install -m 444 TermReadKey/blib/arch/auto/Term/ReadKey/ReadKey.so $RPM_BUILD_ROOT%gpgdirlibdir/%gpgdirmoddir/auto/Term/ReadKey/ReadKey.so
+cd ..
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%pre
+
+%post
+
+%preun
+
+%files
+%defattr(-,root,root)
+%_bindir/*
+%{_mandir}/man1/*
+%_libdir/%name
+
+%changelog
+* Sat Sep 05 2009 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9.5 release
+
+* 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
+
+* Sun Aug 31 2008 Michael Rash <mbr@cipherdyne.org>
+- Updated to use the deps/ directory for all perl module sources.
+- gpgdir-1.9.2 release
+
+* Sat Jun 07 2008 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9.1 release
+
+* Sat May 31 2008 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9 release
+
+* Mon Feb 18 2008 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.8 release
+
+* Mon Feb 18 2008 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.7 release
+
+* Sun Feb 17 2008 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.6 release
+
+* Fri Aug 31 2007 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.5 release
+
+* Sat Jul 20 2007 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.4 release
+
+* Sat Jun 09 2007 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.3 release
+
+* Mon May 28 2007 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.2 release
+
+* Mon May 21 2007 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.1 release
+
+* Sun Sep 17 2006 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.0.3 release (1.0.2 was skipped accidentally).
+
+* Sat Sep 16 2006 Michael Rash <mbr@cipherdyne.org>
+- Added x86_64 RPM.
+- Removed iptables as a prerequisite.
+- gpgdir-1.0.1 release
+
+* Wed Sep 13 2006 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.0 release
+
+* Thu Sep 09 2006 Michael Rash <mbr@cipherdyne.org>
+- Initial RPM release of gpgdir-0.9.9

diff --git a/gpgdir/packaging/gpgdir-nodeps.spec b/gpgdir/packaging/gpgdir-nodeps.spec
index 11186a2fd31639bb575c1024e736807c9c7f35c3..5e97b40ea9cb72bdfd4cf9ab144e6d365815d041 100644 (file)
--- a/gpgdir/packaging/gpgdir-nodeps.spec
+++ b/gpgdir/packaging/gpgdir-nodeps.spec
@@ -1,5 +1,5 @@
 %define name gpgdir
 %define name gpgdir

-%define version 1.9.4
+%define version 1.9.5

 %define release 1
 %define gpgdirlibdir %_libdir/%name
 
 %define release 1
 %define gpgdirlibdir %_libdir/%name
 


@@ -58,6 +58,9 @@ install -m 644 gpgdir.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 %_libdir/%name
 
 %changelog
 %_libdir/%name
 
 %changelog

+* Sat Sep 05 2009 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9.5 release
+

 * Thu Feb 12 2009 Michael Rash <mbr@cipherdyne.org>
 - gpgdir-1.9.4 release
 
 * Thu Feb 12 2009 Michael Rash <mbr@cipherdyne.org>
 - gpgdir-1.9.4 release
 

diff --git a/gpgdir/packaging/gpgdir.spec b/gpgdir/packaging/gpgdir.spec
index d446670d7c19b6919c6fde9d49a546f748339868..198ee626677fdf4ea69da13a41931d1a03bf9880 100644 (file)
--- a/gpgdir/packaging/gpgdir.spec
+++ b/gpgdir/packaging/gpgdir.spec
@@ -1,5 +1,5 @@
 %define name gpgdir
 %define name gpgdir

-%define version 1.9.4
+%define version 1.9.5

 %define release 1
 %define gpgdirlibdir %_libdir/%name
 
 %define release 1
 %define gpgdirlibdir %_libdir/%name
 


@@ -16,6 +16,7 @@ Group: Applications/Cryptography
 Url: http://www.cipherdyne.org/gpgdir/
 Source: %name-%version.tar.gz
 BuildRoot: %_tmppath/%{name}-buildroot
 Url: http://www.cipherdyne.org/gpgdir/
 Source: %name-%version.tar.gz
 BuildRoot: %_tmppath/%{name}-buildroot

+BuildRequires: perl-ExtUtils-MakeMaker

 #Prereq: rpm-helper
 
 %description
 #Prereq: rpm-helper
 
 %description


@@ -115,6 +116,9 @@ cd ..
 %_libdir/%name
 
 %changelog
 %_libdir/%name
 
 %changelog

+* Sat Sep 05 2009 Michael Rash <mbr@cipherdyne.org>
+- gpgdir-1.9.5 release
+

 * Thu Feb 12 2009 Michael Rash <mbr@cipherdyne.org>
 - gpgdir-1.9.4 release
 
 * Thu Feb 12 2009 Michael Rash <mbr@cipherdyne.org>
 - gpgdir-1.9.4 release
 

diff --git a/gpgdir/test/gpgdir_test.pl b/gpgdir/test/gpgdir_test.pl
index 0d851678a7b4a0d9fbb9bdded2b4dee77ce21870..6f1a3c417111a06b552b69e7adcb952bb447bb14 100755 (executable)
--- a/gpgdir/test/gpgdir_test.pl
+++ b/gpgdir/test/gpgdir_test.pl
@@ -9,9 +9,9 @@
 #
 # Author: Michael Rash (mbr@cipherdyne.org)
 #
 #
 # Author: Michael Rash (mbr@cipherdyne.org)
 #

-# Version: 1.9.4
+# Version: 1.9.5

 #
 #

-# Copyright (C) 2008 Michael Rash (mbr@cipherdyne.org)
+# Copyright (C) 2008-2009 Michael Rash (mbr@cipherdyne.org)

 #
 # License (GNU Public License):
 #
 #
 # License (GNU Public License):
 #


@@ -27,7 +27,7 @@
 #
 #############################################################################
 #
 #
 #############################################################################
 #

-# $Id: gpgdir_test.pl 335 2009-02-13 04:48:54Z mbr $
+# $Id: gpgdir_test.pl 341 2009-08-26 02:43:51Z mbr $

 #
 
 use Digest::MD5 'md5_base64';
 #
 
 use Digest::MD5 'md5_base64';


@@ -284,7 +284,7 @@ sub recursively_decrypted() {
     find(\&find_files, $data_dir);
     for my $file (@data_dir_files) {
         if (-f $file and not ($file =~ m|^\.| or $file =~ m|/\.|)) {
     find(\&find_files, $data_dir);
     for my $file (@data_dir_files) {
         if (-f $file and not ($file =~ m|^\.| or $file =~ m|/\.|)) {

-            if ($file =~ m|\.gpg$|) {
+            if ($file =~ m|\.gpg$| or $file =~ m|\.pgp$|) {

                 return &print_errors("[-] File $file not encrypted");
             }
         }
                 return &print_errors("[-] File $file not encrypted");
             }
         }


@@ -410,7 +410,8 @@ sub skipped_hidden_files_dirs() {
         if ($file =~ m|^\.| or $file =~ m|/\.|) {
             ### check for any .gpg or .asc extensions except
             ### for the gpgdir_map_file
         if ($file =~ m|^\.| or $file =~ m|/\.|) {
             ### check for any .gpg or .asc extensions except
             ### for the gpgdir_map_file

-            if ($file =~ m|\.gpg$| or $file =~ m|\.asc$|) {
+            if ($file =~ m|\.gpg$| or $file =~ m|\.asc$|
+                    or $file =~ m|\.pgp$|) {

                 return &print_errors("[-] Encrypted hidden file");
             }
         }
                 return &print_errors("[-] Encrypted hidden file");
             }
         }


@@ -426,7 +427,7 @@ sub obf_skipped_hidden_files_dirs() {
             ### check for any .gpg or .asc extensions except
             ### for the gpgdir_map_file
             if ($file !~ m|gpgdir_map_file| and ($file =~ m|\.gpg$|
             ### check for any .gpg or .asc extensions except
             ### for the gpgdir_map_file
             if ($file !~ m|gpgdir_map_file| and ($file =~ m|\.gpg$|

-                    or $file =~ m|\.asc$|)) {
+                    or $file =~ m|\.asc$| or $file =~ m|\.pgp$|)) {

                 return &print_errors("[-] Encrypted hidden file");
             }
         }
                 return &print_errors("[-] Encrypted hidden file");
             }
         }