1.4.11 release candidate

[Steven M. Schweda]

From: Werner Koch <wk at gnupg.org>

   Re: VMS-related changes.

> I went over the diffs from 1.4.10b and hopefully applied all of the
> *.[ch] changes.  I have no way to check them.  Please let me know if I
> missed something.  (svn rev5425 in branches/STABLE-BRANCH-1-4).

   Sorry it took so long to get back to you on these changes.  After a
visual check, I think that you got almost everything (or else I missed
it, too.)  Many thanks.  (It would be easier for me to check the next
release candidate than to try to establish all the infrastructure needed
to get a Subversion kit here, so a true test may have to wait a while.)

   An exception seems to be some VMS-specific file-name and -suffix
changes in "config.h.in" and "g10/keyring.c".  The old ODS2 file system
(still commonly used) on VMS doesn't do well with "~" or multiple dots,
so I'd like to switch from (ODS2-hostile) constants in "g10/keyring.c"
to macros defined in "config.h.in" (and "vms/config.h_vms", for me). 
Again, I believe that this will cause no trouble on non-VMS systems.

--- config.h.in_orig	2009-12-03 13:27:10 -0600
+++ config.h.in	2009-12-06 15:06:55 -0600
@@ -893,12 +893,23 @@
 # define GNUPG_HOMEDIR     "c:\\\\gnupg"
 #else
 # ifdef __VMS
-#  define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" 
+#  define GNUPG_DATADIR     "/SYS$MANAGER/gnupg_share"
+#  define GNUPG_HOMEDIR     "/SYS$LOGIN/gnupg"
+#  define GNUPG_LIBDIR      "/SYS$MANAGER/gnupg_share"
+#  define GNUPG_LIBEXECDIR  ""
 # else
 #  define GNUPG_HOMEDIR "~/.gnupg" 
 # endif
 #endif
 
+#ifdef __VMS
+# define BAK_SFX "_bak"
+# define TMP_SFX "_tmp"
+#else /* def __VMS */
+# define BAK_SFX "~"
+# define TMP_SFX ".tmp"         /* EXTSEP_S + "tmp" */
+#endif /* def __VMS [else] */
+
 /* Hack used for W32: ldap.m4 also tests for the ASCII version of
    ldap_start_tls_s because that is the actual symbol used in the
    library.  winldap.h redefines it to our commonly used value,



--- g10/keyring.c_orig	2009-07-17 05:15:40 -0500
+++ g10/keyring.c	2009-12-03 14:26:08 -0600
@@ -1182,11 +1182,11 @@
 	strcpy (stpcpy(tmpfname, template), EXTSEP_S "tmp");
     }
 # else /* Posix file names */
-    bakfname = xmalloc (strlen( template ) + 2);
-    strcpy (stpcpy (bakfname,template),"~");
+    bakfname = xmalloc (strlen( template ) + sizeof( BAK_SFX));
+    strcpy (stpcpy (bakfname, template), BAK_SFX);
 
-    tmpfname = xmalloc (strlen( template ) + 5);
-    strcpy (stpcpy(tmpfname,template), EXTSEP_S "tmp");
+    tmpfname = xmalloc (strlen( template ) + sizeof( TMP_SFX));
+    strcpy (stpcpy(tmpfname, template), TMP_SFX);
 # endif /* Posix filename */
 
     /* Create the temp file with limited access */


You might want to check to see if I counted those characters correctly.

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

   Steven M. Schweda               sms at antinode-info
   382 South Warwick Street        (+1) 651-699-9818
   Saint Paul  MN  55105-2547