security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

VMS fixes

Browse Source
This commit is contained in:
Werner Koch 2010-10-10 09:53:02 +00:00
parent 5b99bbc88e
commit 41f5b0a402
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-10-10 Werner Koch <wk@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@g10code.com> 2010-10-05 Werner Koch <wk@g10code.com>
* configure.ac: Remove check for the faqprog. * configure.ac: Remove check for the faqprog.

17
configure.ac
View File

@ -25,8 +25,8 @@ min_automake_version="1.9.3"
# Remember to change the version number immediately *after* a release. # Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an # Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh --force" right before creating a distribution. # "svn up" and "autogen.sh --force" right before creating a distribution.
m4_define([my_version], [1.4.11rc1]) m4_define([my_version], [1.4.11])
m4_define([my_issvn], [no]) m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gnupg], AC_INIT([gnupg],
@ -460,6 +460,14 @@ is intended for making fat binary builds on OS X. */
# define PATHSEP_S ":" # define PATHSEP_S ":"
#endif #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. */ /* For some OSes we need to use fixed strings for certain directories. */
#ifdef HAVE_DRIVE_LETTERS #ifdef HAVE_DRIVE_LETTERS
@ -470,7 +478,10 @@ is intended for making fat binary builds on OS X. */
# define GNUPG_HOMEDIR "c:\\\\gnupg" # define GNUPG_HOMEDIR "c:\\\\gnupg"
#else #else
# ifdef __VMS # 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 # else
# define GNUPG_HOMEDIR "~/.gnupg" # define GNUPG_HOMEDIR "~/.gnupg"
# endif # endif

4
g10/ChangeLog
View File

@ -1,3 +1,7 @@
2010-10-10 Werner Koch <wk@g10code.com>
* keyring.c (create_tmp_file): Use GNUPG_TMP_SFX anf GNUPG_BAK_SFX.
2010-09-28 David Shaw <dshaw@jabberwocky.com> 2010-09-28 David Shaw <dshaw@jabberwocky.com>
* options.skel: Make the example for force-v3-sigs match * options.skel: Make the example for force-v3-sigs match

8
g10/keyring.c
View File

@ -1182,11 +1182,11 @@ create_tmp_file (const char *template,
strcpy (stpcpy(tmpfname, template), EXTSEP_S "tmp"); strcpy (stpcpy(tmpfname, template), EXTSEP_S "tmp");
} }
# else /* Posix file names */ # else /* Posix file names */
bakfname = xmalloc (strlen( template ) + 2); bakfname = xmalloc (strlen (template) + sizeof (GNUPG_BAK_SFX) + 1);
strcpy (stpcpy (bakfname,template),"~"); strcpy (stpcpy (bakfname, template), GNUPG_BAK_SFX);
tmpfname = xmalloc (strlen( template ) + 5); tmpfname = xmalloc (strlen (template) + sizeof (GNUPG_TMP_SFX) + 1 );
strcpy (stpcpy(tmpfname,template), EXTSEP_S "tmp"); strcpy (stpcpy(tmpfname, template), GNUPG_TMP_SFX);
# endif /* Posix filename */ # endif /* Posix filename */
/* Create the temp file with limited access */ /* Create the temp file with limited access */