Shall we do a 1.4.12 ?

[Steven M. Schweda]

From: Werner Koch <wk at gnupg.org>

> the last 1.4 release is more than a year old (2010-10-08).  The repo has
> collected a few minor bug fixes and small enhancements.  Shall I do a
> new release next week?

   Ok with me.  Below are the VMS-related changes to the main code since
1.4.11.  I think that most of them are old (type casts to avoid
%CC-I-QUESTCOMPARE1 complaints), but the changes to g10/gpg.c and
util/ttyio.c may be new.  The idea in g10/gpg.c is to default to --batch
when running in a VMS batch job.  The changes to util/ttyio.c are
intended to defeat an infinite loop in a VMS batch job, which I believe
was reported here before.  (One of the victims reported this problem. 
Amazingly enough, there seem to be some actual, real-world users of this
stuff on VMS.   Setting --batch automatically helps, but doesn't cover
every case.)


--- g10/encr-data.c_orig	2008-12-11 10:40:05 -0600
+++ g10/encr-data.c	2010-10-18 12:01:56 -0500
@@ -298,7 +298,7 @@
     if( control == IOBUFCTRL_UNDERFLOW ) {
 	assert(a);
 	n = iobuf_read( a, buf, size );
-	if( n == -1 ) n = 0;
+	if( n == (size_t)-1 ) n = 0;
 	if( n ) {
             if (fc->cipher_hd)
                 cipher_decrypt( fc->cipher_hd, buf, buf, n);


--- g10/gpg.c_orig	2010-07-05 04:17:37 -0500
+++ g10/gpg.c	2011-09-08 13:37:06 -0500
@@ -40,6 +40,10 @@
 #include <windows.h>
 #endif
 
+#ifdef __VMS
+# include "vms.h"
+#endif
+
 #define INCLUDED_BY_MAIN_MODULE 1
 #include "packet.h"
 #include "iobuf.h"
@@ -1872,6 +1876,14 @@
     opt.lock_once = 1;
 #endif /* __riscos__ */
 
+#ifdef __VMS
+    /* On VMS, set the default value of the "--[no-]batch" flag
+     * according to the actual process mode.  The user can override this
+     * with an explicit command-line "--[no-]batch" option.
+     */
+    opt.batch = batch_mode_vms();
+#endif
+
     reopen_std();
     trap_unaligned();
     secmem_set_flags( secmem_get_flags() | 2 ); /* suspend warnings */


--- g10/trustdb.c_orig	2009-12-21 08:34:19 -0600
+++ g10/trustdb.c	2010-10-18 12:05:13 -0500
@@ -2343,7 +2343,7 @@
 	    {
 	      k->ownertrust = ask_ownertrust (k->kid,min);
 
-	      if (k->ownertrust == -1)
+	      if (k->ownertrust == (unsigned int)-1)
 		{
 		  quit=1;
 		  goto leave;


--- util/ttyio.c_orig	2010-09-28 04:39:05 -0500
+++ util/ttyio.c	2012-01-06 08:03:12 -0600
@@ -185,7 +185,9 @@
 #else
     ttyfp = batchmode? stderr : fopen( tty_get_ttyname (), "r+");
     if( !ttyfp ) {
-	log_error("cannot open `%s': %s\n",
+	ttyfp = stderr;         /* Fall-back for failing fopen(). */
+	initialized = 1;        /* Don't come back again, ever. */
+	log_error("cannot open tty, `%s': %s\n",
                   tty_get_ttyname (), strerror(errno) );
 	exit(2);
     }


   Thanks again for including the VMS-related changes in the main code
stream.  Wake me if you have any questions or complaints.

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

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