Preparing an interim release

tools/ChangeLog

@@ -1,3 +1,11 @@
+2005-10-19  Werner Koch  <wk@g10code.com>
+
+	* gpgconf-comp.c (gc_options_scdaemon): New option --disable-keypad.
+
+2005-09-22  Werner Koch  <wk@g10code.com>
+
+	* rfc822parse.c (parse_field): Tread Content-Disposition special.
+
 2005-10-08  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (watchgnupg_LDADD): New variable.

tools/gpgconf-comp.c

@@ -528,7 +528,9 @@ static gc_option_t gc_options_scdaemon[] =
    { "disable-ccid", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
      "gnupg", "do not use the internal CCID driver",
      GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
-
+   { "disable-keypad", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+     "gnupg", "do not use a reader's keypad",
+     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
 
    { "Debug",
      GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
@@ -2447,7 +2449,8 @@ gc_component_change_options (int component, FILE *in)
 		{
 #ifdef HAVE_W32_SYSTEM
                   /* FIXME: Won't work becuase W32 doesn't silently
-                     overwrite. */
+                     overwrite. Fix it by creating a backup copy and
+                     deliting the orginal file first. */
                   err = rename (src_pathname[i], dest_pathname[i]);
 #else /*!HAVE_W32_SYSTEM*/
 		  /* This is a bit safer than rename() because we

tools/rfc822parse.c

@@ -766,6 +766,7 @@ parse_field (HDR_LINE hdr)
   } tspecial_header[] = {
     { "Content-Type", 12},
     { "Content-Transfer-Encoding", 25},
+    { "Content-Disposition", 19},
     { NULL, 0}
   };
   const char *delimiters;