[svn] GnuPG - r5442 - in branches/STABLE-BRANCH-1-4: . g10

[svn author wk]

Author: wk
Date: 2010-10-10 11:53:02 +0200 (Sun, 10 Oct 2010)
New Revision: 5442

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keyring.c
Log:
VMS fixes


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2010-10-08 14:37:42 UTC (rev 5441)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2010-10-10 09:53:02 UTC (rev 5442)
@@ -1,3 +1,8 @@
+2010-10-10  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (AH_BOTTOM): Add GNUPG_BAK_SFX and GNUPG_TMP_SFX.
+	Define GNUPG_HOMEDIR et al for VMS.
+
 2010-10-05  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Remove check for the faqprog.

Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-10-08 14:37:42 UTC (rev 5441)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2010-10-10 09:53:02 UTC (rev 5442)
@@ -1,3 +1,7 @@
+2010-10-10  Werner Koch  <wk at g10code.com>
+
+	* keyring.c (create_tmp_file): Use GNUPG_TMP_SFX anf GNUPG_BAK_SFX.
+
 2010-09-28  David Shaw  <dshaw at jabberwocky.com>
 
 	* options.skel: Make the example for force-v3-sigs match

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2010-10-08 14:37:42 UTC (rev 5441)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2010-10-10 09:53:02 UTC (rev 5442)
@@ -25,8 +25,8 @@
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh --force" right before creating a distribution.
-m4_define([my_version], [1.4.11rc1])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.4.11])
+m4_define([my_issvn], [yes])
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 AC_INIT([gnupg], 
@@ -460,7 +460,15 @@
 # define PATHSEP_S ":"
 #endif
 
+#ifdef __VMS
+# define GNUPG_BAK_SFX "_bak"
+# define GNUPG_TMP_SFX "_tmp"
+#else /*!def __VMS */
+# define GNUPG_BAK_SFX "~"
+# define GNUPG_TMP_SFX EXTSEP_S "tmp" 
+#endif /* def __VMS [else] */
 
+
 /* For some OSes we need to use fixed strings for certain directories.  */
 #ifdef HAVE_DRIVE_LETTERS
 # define LOCALEDIR         "c:\\\\lib\\\\gnupg\\\\locale"
@@ -470,7 +478,10 @@
 # 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

Modified: branches/STABLE-BRANCH-1-4/g10/keyring.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyring.c	2010-10-08 14:37:42 UTC (rev 5441)
+++ branches/STABLE-BRANCH-1-4/g10/keyring.c	2010-10-10 09:53:02 UTC (rev 5442)
@@ -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 (GNUPG_BAK_SFX) + 1);
+    strcpy (stpcpy (bakfname, template), GNUPG_BAK_SFX);
 
-    tmpfname = xmalloc (strlen( template ) + 5);
-    strcpy (stpcpy(tmpfname,template), EXTSEP_S "tmp");
+    tmpfname = xmalloc (strlen (template) + sizeof (GNUPG_TMP_SFX) + 1 );
+    strcpy (stpcpy(tmpfname, template), GNUPG_TMP_SFX);
 # endif /* Posix filename */
 
     /* Create the temp file with limited access */