This patch contains hand-selected fixes from upstream, some are needed to make 'make check' of gpgme succeed without errors. - bk@suse.de --- gnupg-2.0.8//doc/qualified.txt 2007-12-13 16:13:10.000000000 +0100 +++ gnupg-r4688//doc/qualified.txt 2008-02-06 16:58:10.000000000 +0100 @@ -4,9 +4,9 @@ # signatures are. Comments like this one and empty lines are allowed # Lines do have a length limit but this is not a serious limitation as # the format of the entries is fixed and checked by gpgsm: A -# non-comment line starts with optional white spaces, followed by -# exactly 40 hex character, white space and a lowercased 2 letter -# country code. Additional data delimited with by a white space is +# non-comment line starts with optional whitespaces, followed by +# exactly 40 hex character, whitespace and a lowercased 2 letter +# country code. Additional data delimited with by a whitespace is # current ignored but might late be used for other purposes. # # Note: The subversion copy of this file carries a gpg:signature @@ -193,7 +193,7 @@ E0:BF:1B:91:91:6B:88:E4:F1:15:92:22:CE:3 #[checked: 2007-12-13 via received ZIP file with qualified signature from # /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag # /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg] -C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA +C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:76:E0:B8:A8:FE:A3:CA de # ID: 0x3A7D979B # S/N: 00C4216083F35C54F67B09A80C3C55FE7D @@ -208,7 +208,7 @@ C9:2F:E6:50:DB:32:59:E0:CE:65:55:F3:8C:7 #[checked: 2007-12-13 via received ZIP file with qualified signature from # /CN=Dr. Matthias Stehle/O=Deutscher Sparkassenverlag # /C=DE/SerialNumber=DSV0000000008/SN=Stehle/GN=Matthias Georg"] -D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B +D5:C7:50:F2:FE:4E:EE:D7:C7:B1:E4:13:7B:FB:54:84:3A:7D:97:9B de #******************************************* --- gnupg-2.0.8//g10/card-util.c 2007-07-17 14:59:52.000000000 +0200 +++ gnupg-r4688//g10/card-util.c 2008-02-06 16:58:14.000000000 +0100 @@ -156,6 +156,8 @@ get_manufacturer (unsigned int no) case 0x0001: return "PPC Card Systems"; case 0x0002: return "Prism"; case 0x0003: return "OpenFortress"; + case 0x0004: return "Wewid AB"; + /* 0x00000 and 0xFFFF are defined as test cards per spec, 0xFFF00 to 0xFFFE are assigned for use with randomly created serial numbers. */ --- gnupg-2.0.8//g10/gpg.c 2007-12-14 12:08:13.000000000 +0100 +++ gnupg-r4688//g10/gpg.c 2008-02-06 16:58:14.000000000 +0100 @@ -623,6 +623,7 @@ static ARGPARSE_OPTS opts[] = { { oLockNever, "lock-never", 0, "@" }, { oLoggerFD, "logger-fd",1, "@" }, { oLoggerFile, "log-file",2, "@" }, + { oLoggerFile, "logger-file",2, "@" }, /* For 1.4 compatibility. */ { oUseEmbeddedFilename, "use-embedded-filename", 0, "@" }, { oNoUseEmbeddedFilename, "no-use-embedded-filename", 0, "@" }, { oUtf8Strings, "utf8-strings", 0, "@" }, --- gnupg-2.0.8//tools/ChangeLog 2007-12-14 16:56:04.000000000 +0100 +++ gnupg-r4688//tools/ChangeLog 2008-02-06 16:58:09.000000000 +0100 @@ -1,3 +1,18 @@ +2008-02-01 Marcus Brinkmann + + * gpgconf-comp.c (gc_component_list_options): Fix memcpy. + Reported by Marc Mutz. + +2008-01-22 Werner Koch + + * gpgconf-comp.c: Use gnupg domain for honor-http-proxy. Make + "LDAP server list" group title translatable. + +2008-01-17 Marcus Brinkmann + + * gpgconf-comp.c (change_options_program): Strip duplicated + utf8-strings entries for gnupg backend. Don't create them either. + 2007-12-10 Marcus Brinkmann * gpgconf-comp.c (gc_component_list_options): Fix up expert level --- gnupg-2.0.8//tools/gpgconf-comp.c 2007-12-14 16:56:04.000000000 +0100 +++ gnupg-r4688//tools/gpgconf-comp.c 2008-02-06 16:58:10.000000000 +0100 @@ -840,7 +840,7 @@ static gc_option_t gc_options_dirmngr[] "dirmngr", "|URL|redirect all HTTP requests to URL", GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR }, { "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, - "dirmngr", N_("use system's HTTP proxy setting"), + "gnupg", N_("use system's HTTP proxy setting"), GC_ARG_TYPE_NONE, GC_BACKEND_DIRMNGR }, { "LDAP", @@ -874,7 +874,7 @@ static gc_option_t gc_options_dirmngr[] GC_BACKEND_DIRMNGR in this component, so that the entry for "ldapserverlist-file will be initialized before this one. */ { "LDAP Server", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_LIST, GC_LEVEL_BASIC, - NULL, "LDAP server list", + "gnupg", N_("LDAP server list"), GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST }, { "max-replies", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC, "dirmngr", "|N|do not return more than N items in one query", @@ -1568,7 +1568,7 @@ gc_component_list_options (int component gc_option_t opt_copy; /* Fix up the group level. */ - memcpy (&opt_copy, option, sizeof (opt)); + memcpy (&opt_copy, option, sizeof (opt_copy)); opt_copy.level = level; list_one_option (&opt_copy, out); } @@ -2467,6 +2467,8 @@ change_options_program (gc_component_t c char *src_filename; char *dest_filename; char *orig_filename; + /* Special hack for gpg, see below. */ + int utf8strings_seen = 0; /* FIXME. Throughout the function, do better error reporting. */ dest_filename = xstrdup (get_config_pathname (component, backend)); @@ -2526,6 +2528,15 @@ change_options_program (gc_component_t c else break; } + else if (backend == GC_BACKEND_GPG && in_marker + && ! strcmp ("utf8-strings\n", line)) + { + /* Strip duplicated entries. */ + if (utf8strings_seen) + disable = 1; + else + utf8strings_seen = 1; + } start = line; while (*start == ' ' || *start == '\t') @@ -2591,7 +2602,7 @@ change_options_program (gc_component_t c followed by the rest of the original file. */ /* We have to turn on UTF8 strings for GnuPG. */ - if (backend == GC_BACKEND_GPG) + if (backend == GC_BACKEND_GPG && ! utf8strings_seen) fprintf (src_file, "utf8-strings\n"); option = gc_component[component].options;