Preparing 1.4.5

5 files changed, 32 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a292706c..3533a2bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-01  Werner Koch  <[email protected]>
+
+	Released 1.4.5.
+
+2006-07-31  Werner Koch  <[email protected]>
+
+	* README: Updated info on the key used to sign the tarball.
+
 2006-07-28  Werner Koch  <[email protected]>
 
 	Released 1.4.5rc1.
diff --git a/NEWS b/NEWS
index f21806343..2ba5ec4ea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.4.5
+Noteworthy changes in version 1.4.5 (2006-08-01)
 ------------------------------------------------
 
     * Reverted check for valid standard handles under Windows.
diff --git a/README b/README
index 6bd491041..b85a89a25 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.4.4
+			    Version 1.4.5
 
 	 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 		 2005, 2006 Free Software Foundation, Inc.
@@ -86,10 +86,10 @@
 	$ gpg --verify gnupg-x.y.z.tar.gz.sig
 
        This checks that the detached signature gnupg-x.y.z.tar.gz.sig
-       is indeed a signature of gnupg-x.y.z.tar.gz.  The key used to
-       create this signature is:
+       is indeed a signature of gnupg-x.y.z.tar.gz.  The key currently
+       used to create this signature is:
 
-       "pub  1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) <[email protected]>"
+       "pub  1024R/1CE0C630 2006-01-01 Werner Koch (dist sig) <[email protected]>"
 
        If you do not have this key, you can get it from the source in
        the file doc/samplekeys.asc (use "gpg --import  doc/samplekeys.asc"
@@ -97,7 +97,7 @@
        make sure that this is really the key and not a faked one. You
        can do this by comparing the output of:
 
-		$ gpg --fingerprint 0x57548DCD
+		$ gpg --fingerprint 0x1CE0C630
 
        with the fingerprint published elsewhere.
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3153339b6..2c4cef774 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-31  Werner Koch  <[email protected]>
 
+	* openfile.c (open_outfile) [USE_ONLY_8DOT3]: Search backwards for
+	the dot.  Fixes bug 654.
+
 	* passphrase.c (agent_open): Use log_info instead of log_error to
 	allow a fallback without having gpg return an error code.  Fixes
 	bug #655.
diff --git a/g10/openfile.c b/g10/openfile.c
index 16afaf167..33e755d8f 100644
--- a/g10/openfile.c
+++ b/g10/openfile.c
@@ -201,10 +201,10 @@ open_outfile( const char *iname, int mode, IOBUF *a )
 #ifdef USE_ONLY_8DOT3
       if (opt.mangle_dos_filenames)
         {
-          /* It is quite common DOS system to have only one dot in a
+          /* It is quite common for DOS system to have only one dot in a
            * a filename So if we have something like this, we simple
-           * replace the suffix execpt in cases where the suffix is
-           * larger than 3 characters and not the same as.
+           * replace the suffix except in cases where the suffix is
+           * larger than 3 characters and not identlically to the new one.
            * We should really map the filenames to 8.3 but this tends to
            * be more complicated and is probaly a duty of the filesystem
            */
@@ -214,16 +214,22 @@ open_outfile( const char *iname, int mode, IOBUF *a )
           
           buf = xmalloc(strlen(iname)+4+1);
           strcpy(buf,iname);
-          dot = strchr(buf, '.' );
+          dot = strrchr(buf, '.' );
           if ( dot && dot > buf && dot[1] && strlen(dot) <= 4
-				  && CMP_FILENAME(newsfx, dot) )
+               && CMP_FILENAME(newsfx, dot) 
+               && !(strchr (dot, '/') || strchr (dot, '\\')))
             {
-              strcpy(dot, newsfx );
+              /* There is a dot, the dot is not the first character,
+                 the suffix is not longer than 3, the suffix is not
+                 equal to the new suffix and tehre is no path delimter
+                 after the dot (e.g. foo.1/bar): Replace the
+                 suffix. */
+              strcpy (dot, newsfx );
             }
-          else if ( dot && !dot[1] ) /* don't duplicate a dot */
-            strcpy( dot, newsfx+1 );
+          else if ( dot && !dot[1] ) /* Don't duplicate a trailing dot. */
+            strcpy ( dot, newsfx+1 );
           else
-            strcat ( buf, newsfx );
+            strcat ( buf, newsfx ); /* Just append the new suffix. */
         }
       if (!buf)
 #endif /* USE_ONLY_8DOT3 */