diff --git a/ChangeLog b/ChangeLog index e6569f9c3..234924be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-09-10 Werner Koch + + Released 2.0.7. + 2007-08-27 Werner Koch * configure.ac: Remove remaining support for internal regex. diff --git a/NEWS b/NEWS index 99380d82a..da09bdad7 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Noteworthy changes in version 2.0.7 +Noteworthy changes in version 2.0.7 (2007-09-10) ------------------------------------------------ * Fixed encryption problem if duplicate certificates are in the diff --git a/README.maint b/README.maint index 2e56ace6a..3621fda11 100644 --- a/README.maint +++ b/README.maint @@ -30,8 +30,8 @@ Release process: * Run "./autogen.sh --force" (--force is required for the svn magic in configure.ac and a good idea in any case) - * Run configure as usual. - * Run "make distcheck" + * Run "configure --enable-maintainer-mode". + * Run "make distcheck". * Build and test the new tarball (best on a different machine). * Build and test the W32 version. * Using the final test build run a "make -C doc online". diff --git a/TODO b/TODO index 7cffa2446..07e348674 100644 --- a/TODO +++ b/TODO @@ -125,7 +125,7 @@ * Howtos ** Migrate OpenPGP keys to another system -* Duplicate certifciates +* Duplicate certificates This may happen and lead to an Ambiguous Name error. Solution is to check the certs for identity before throwing this error. diff --git a/configure.ac b/configure.ac index 578b7c14d..8a9873543 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ min_automake_version="1.10" # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. m4_define([my_version], [2.0.7]) -m4_define([my_issvn], [yes]) +m4_define([my_issvn], [no]) m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \ diff --git a/po/be.po b/po/be.po index 6506765f9..d9599c931 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -664,7 +664,7 @@ msgstr "дрэнны пароль" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "памылка стварэньня \"%s\": %s\n" @@ -7545,7 +7545,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/ca.po b/po/ca.po index 5764796b2..e7714610a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -700,7 +700,7 @@ msgstr "canvia la contrasenya" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "error en la creació de la contrasenya: %s\n" @@ -8134,7 +8134,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/cs.po b/po/cs.po index b2b6ac6a3..b86d5069b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -676,7 +676,7 @@ msgstr "zm msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "chyba pi vytven hesla: %s\n" @@ -7815,7 +7815,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/da.po b/po/da.po index 04c720f98..334ae2b8a 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -669,7 +669,7 @@ msgstr " msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "fejl ved oprettelse af kodestning: %s\n" @@ -7700,7 +7700,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/de.po b/po/de.po index 6fabd11c2..cf5555a5d 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-2.0.6\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2007-08-29 18:51+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -688,7 +688,7 @@ msgstr "Die Passphrase ändern" msgid "I'll change it later" msgstr "Ich werde sie später ändern" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, c-format msgid "error creating a pipe: %s\n" msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n" @@ -7907,7 +7907,7 @@ msgstr "Konfiguration der zu nutzenden LDAP-Server" msgid "Configuration for OCSP" msgstr "Konfiguration zu OCSP" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n" diff --git a/po/el.po b/po/el.po index b31a25654..86b8bb266 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -674,7 +674,7 @@ msgstr " msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr " : %s\n" @@ -7988,7 +7988,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/eo.po b/po/eo.po index ddb76b8c9..3f013e18a 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -674,7 +674,7 @@ msgstr " msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "eraro dum kreado de pasfrazo: %s\n" @@ -7934,7 +7934,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/es.po b/po/es.po index e5e8c6c8a..c04c81526 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2007-08-16 11:35+0200\n" "Last-Translator: Jaime Surez \n" "Language-Team: Spanish \n" @@ -705,7 +705,7 @@ msgstr "cambia la frase contrase msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "error creando frase contrasea: %s\n" @@ -7862,7 +7862,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/et.po b/po/et.po index 4cf42dc4b..2bdac4ca2 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -673,7 +673,7 @@ msgstr "muuda parooli" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "viga parooli loomisel: %s\n" @@ -7893,7 +7893,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/fi.po b/po/fi.po index 6e8c3fa96..53b90bb7a 100644 --- a/po/fi.po +++ b/po/fi.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -690,7 +690,7 @@ msgstr "muuta salasanaa" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "virhe luotaessa salasanaa: %s\n" @@ -7972,7 +7972,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/fr.po b/po/fr.po index 8de310d8b..bf1e69a39 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2005-06-28 00:24+0200\n" "Last-Translator: Gal Quri \n" "Language-Team: French \n" @@ -690,7 +690,7 @@ msgstr "changer la phrase de passe" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "erreur pendant la cration de la phrase de passe: %s\n" @@ -8019,7 +8019,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/gl.po b/po/gl.po index 70813e05b..ddfd2789e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -678,7 +678,7 @@ msgstr "cambia-lo contrasinal" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "erro ao crea-lo contrasinal: %s\n" @@ -7983,7 +7983,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/hu.po b/po/hu.po index 9c50a9d54..6d98fdd54 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc Lszl \n" "Language-Team: Hungarian \n" @@ -673,7 +673,7 @@ msgstr "jelsz msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "Hiba a jelsz ltrehozsakor: %s.\n" @@ -7934,7 +7934,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/id.po b/po/id.po index d4aca5181..1e2d322b2 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -675,7 +675,7 @@ msgstr "ubah passphrase" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "kesalahan penciptaan passphrase: %s\n" @@ -7936,7 +7936,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/it.po b/po/it.po index 12a91fceb..51140a3a0 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -673,7 +673,7 @@ msgstr "cambia la passphrase" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "errore nella creazione della passhprase: %s\n" @@ -7982,7 +7982,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/ja.po b/po/ja.po index 214a21006..4fa85733b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -676,7 +676,7 @@ msgstr " msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "ѥե졼κ顼: %s\n" @@ -7749,7 +7749,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/nb.po b/po/nb.po index 96f33a154..61531c42d 100644 --- a/po/nb.po +++ b/po/nb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.3\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2006-06-13 20:31+0200\n" "Last-Translator: Trond Endrestl \n" "Language-Team: Norwegian Bokml \n" @@ -671,7 +671,7 @@ msgstr "endre passfrasen" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "feil ved opprettelse av passfrase: %s\n" @@ -7618,7 +7618,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/pl.po b/po/pl.po index 8d4a247a4..1d85c728a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -684,7 +684,7 @@ msgstr "zmiana has msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "bd podczas tworzenia hasa: %s\n" @@ -7979,7 +7979,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/pt.po b/po/pt.po index 28581ad74..ec4935c81 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -677,7 +677,7 @@ msgstr "muda a frase secreta" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "erro na criao da frase secreta: %s\n" @@ -7950,7 +7950,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index c7c2e4073..38dd8eb43 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2007-08-16 11:35+0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -678,7 +678,7 @@ msgstr "muda a frase secreta" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "erro na criao da frase secreta: %s\n" @@ -7902,7 +7902,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/ro.po b/po/ro.po index fca453f25..db9604bd3 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -682,7 +682,7 @@ msgstr "schimb msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "eroare la crearea frazei-parol: %s\n" @@ -7843,7 +7843,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/ru.po b/po/ru.po index 471b867b8..8f905f854 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GnuPG 2.0.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2006-11-07 19:31+0300\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -660,7 +660,7 @@ msgstr "сменить фразу-пароль" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, c-format msgid "error creating a pipe: %s\n" msgstr "" @@ -7703,7 +7703,7 @@ msgstr "Настройки LDAP серверов" msgid "Configuration for OCSP" msgstr "Настройки OCSP" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/sk.po b/po/sk.po index c27beb530..350718fdf 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -674,7 +674,7 @@ msgstr "zmeni msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "chyba pri vytvran hesla: %s\n" @@ -7954,7 +7954,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/sv.po b/po/sv.po index e9a7a2b9b..7b367ab03 100644 --- a/po/sv.po +++ b/po/sv.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 2.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2007-02-17 13:13+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -695,7 +695,7 @@ msgstr "ändra en lösenfras" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, c-format msgid "error creating a pipe: %s\n" msgstr "fel när ett rör skapades: %s\n" @@ -7916,7 +7916,7 @@ msgstr "Konfiguration av LDAP-servrar som ska användas" msgid "Configuration for OCSP" msgstr "Konfiguration för OCSP" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index 888492848..099a0ef26 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.9.94\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2006-11-04 03:45+0200\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -665,7 +665,7 @@ msgstr "anahtar parolası değiştirir" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, c-format msgid "error creating a pipe: %s\n" msgstr "boru oluşturulurken hata: %s\n" @@ -7791,7 +7791,7 @@ msgstr "Kullanılacak LDAP sunucularının yapılandırması" msgid "Configuration for OCSP" msgstr "OCSP için yapılandırma" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3ddfeae25..7727fa245 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2006-07-02 10:58+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -680,7 +680,7 @@ msgstr "更改密码" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "生成密码的时候发生错误：%s\n" @@ -7651,7 +7651,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 62b5f2473..cc52500f1 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2007-08-29 18:43+0200\n" +"POT-Creation-Date: 2007-09-10 17:28+0200\n" "PO-Revision-Date: 2005-07-29 09:49+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -676,7 +676,7 @@ msgstr "更改密語" msgid "I'll change it later" msgstr "" -#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1313 +#: common/exechelp.c:371 common/exechelp.c:459 tools/gpgconf-comp.c:1340 #, fuzzy, c-format msgid "error creating a pipe: %s\n" msgstr "建立密語的時候發生錯誤: %s\n" @@ -7691,7 +7691,7 @@ msgstr "" msgid "Configuration for OCSP" msgstr "" -#: tools/gpgconf-comp.c:2955 +#: tools/gpgconf-comp.c:2982 msgid "Note that group specifications are ignored\n" msgstr "" diff --git a/tools/ChangeLog b/tools/ChangeLog index 26db7b768..2273b2c5d 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -9,6 +9,8 @@ 2007-08-31 Werner Koch + * gpgparsemail.c: Support PGP/MIME signed messages. + * gpgconf-comp.c (gc_component_list_components): List the programs names. diff --git a/tools/gpgparsemail.c b/tools/gpgparsemail.c index 9001b4511..525c604ba 100644 --- a/tools/gpgparsemail.c +++ b/tools/gpgparsemail.c @@ -1,5 +1,5 @@ /* gpgparsemail.c - Standalone crypto mail parser - * Copyright (C) 2004 Free Software Foundation, Inc. + * Copyright (C) 2004, 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -64,7 +64,9 @@ struct parse_info_s { int is_pkcs7; /* Old style S/MIME message. */ - int gpgsm_mime; /* gpgsm shall be used from S/MIME. */ + int moss_state; /* State of PGP/MIME or S/MIME parsing. */ + int is_smime; /* This is S/MIME and not PGP/MIME. */ + char *signing_protocol; int hashing_level; /* The nesting level we are hashing. */ int hashing; @@ -167,7 +169,6 @@ run_gnupg (int smime, int sig_fd, int data_fd, int *close_list) int i, c, is_status; unsigned int pos; char status_buf[10]; - const char *cmd = smime? "gpgsm":"gpg"; FILE *fp; if (pipe (rp) == -1) @@ -218,15 +219,25 @@ run_gnupg (int smime, int sig_fd, int data_fd, int *close_list) close (fd); errno = 0; - execlp (cmd, cmd, - "--enable-special-filenames", - "--status-fd", "2", - "--assume-base64", - "--verify", - "--", - "-", data_fd == -1? NULL : data_fd_buf, - NULL); - + if (smime) + execlp ("gpgsm", "gpgsm", + "--enable-special-filenames", + "--status-fd", "2", + "--assume-base64", + "--verify", + "--", + "-", data_fd == -1? NULL : data_fd_buf, + NULL); + else + execlp ("gpg", "gpg", + "--enable-special-filenames", + "--status-fd", "2", + "--verify", + "--debug=512", + "--", + "-", data_fd == -1? NULL : data_fd_buf, + NULL); + die ("failed to exec the crypto command: %s", strerror (errno)); } @@ -323,7 +334,7 @@ verify_signature (struct parse_info_s *info) /* rewind (info->sig_file); */ close_list[0] = -1; - run_gnupg (1, fileno (info->sig_file), + run_gnupg (info->is_smime, fileno (info->sig_file), info->hash_file ? fileno (info->hash_file) : -1, close_list); } @@ -342,14 +353,27 @@ mime_signed_begin (struct parse_info_s *info, rfc822parse_t msg, if (s) { printf ("h signed.protocol: %s\n", s); - if (!strcmp (s, "application/pkcs7-signature") - || !strcmp (s, "application/x-pkcs7-signature")) + if (!strcmp (s, "application/pgp-signature")) { - if (info->gpgsm_mime) - err ("note: ignoring nested pkcs7-signature"); + if (info->moss_state) + err ("note: ignoring nested PGP/MIME or S/MIME signature"); else { - info->gpgsm_mime = 1; + info->moss_state = 1; + info->is_smime = 0; + free (info->signing_protocol); + info->signing_protocol = xstrdup (s); + } + } + else if (!strcmp (s, "application/pkcs7-signature") + || !strcmp (s, "application/x-pkcs7-signature")) + { + if (info->moss_state) + err ("note: ignoring nested PGP/MIME or S/MIME signature"); + else + { + info->moss_state = 1; + info->is_smime = 1; free (info->signing_protocol); info->signing_protocol = xstrdup (s); } @@ -435,6 +459,30 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg) if (debug) show_event (event); + + if (event == RFC822PARSE_BEGIN_HEADER || event == RFC822PARSE_T2BODY) + { + /* We need to check here whether to start collecting signed data + because attachments might come without header lines and thus + we won't see the BEGIN_HEADER event. */ + if (info->moss_state == 1) + { + printf ("c begin_hash\n"); + info->hashing = 1; + info->hashing_level = info->nesting_level; + info->moss_state++; + + if (opt_crypto) + { + assert (!info->hash_file); + info->hash_file = tmpfile (); + if (!info->hash_file) + die ("failed to create temporary file: %s", strerror (errno)); + } + } + } + + if (event == RFC822PARSE_OPEN) { /* Initialize for a new message. */ @@ -453,18 +501,19 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg) { printf ("h media: %*s%s %s\n", info->nesting_level*2, "", s1, s2); - if (info->gpgsm_mime == 3) + if (info->moss_state == 3) { char *buf = xmalloc (strlen (s1) + strlen (s2) + 2); strcpy (stpcpy (stpcpy (buf, s1), "/"), s2); assert (info->signing_protocol); if (strcmp (buf, info->signing_protocol)) - err ("invalid S/MIME structure; expected `%s', found `%s'", + err ("invalid %s structure; expected `%s', found `%s'", + info->is_smime? "S/MIME":"PGP/MIME", info->signing_protocol, buf); else { printf ("c begin_signature\n"); - info->gpgsm_mime++; + info->moss_state++; if (opt_crypto) { assert (!info->sig_file); @@ -490,12 +539,14 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg) } else printf ("h media: %*s none\n", info->nesting_level*2, ""); - + rfc822parse_release_field (ctx); } else printf ("h media: %*stext plain [assumed]\n", info->nesting_level*2, ""); + + info->show_header = 0; info->show_data = 1; info->skip_show = 1; @@ -528,36 +579,18 @@ message_cb (void *opaque, rfc822parse_event_t event, rfc822parse_t msg) else printf ("b last\n"); - if (info->gpgsm_mime == 2 && info->nesting_level == info->hashing_level) + if (info->moss_state == 2 && info->nesting_level == info->hashing_level) { printf ("c end_hash\n"); - info->gpgsm_mime++; + info->moss_state++; info->hashing = 0; } - else if (info->gpgsm_mime == 4) + else if (info->moss_state == 4) { printf ("c end_signature\n"); info->verify_now = 1; } } - else if (event == RFC822PARSE_BEGIN_HEADER) - { - if (info->gpgsm_mime == 1) - { - printf ("c begin_hash\n"); - info->hashing = 1; - info->hashing_level = info->nesting_level; - info->gpgsm_mime++; - - if (opt_crypto) - { - assert (!info->hash_file); - info->hash_file = tmpfile (); - if (!info->hash_file) - die ("failed to create temporary file: %s", strerror (errno)); - } - } - } return 0; } @@ -634,7 +667,8 @@ parse_message (FILE *fp) info.hash_file = NULL; fclose (info.sig_file); info.sig_file = NULL; - info.gpgsm_mime = 0; + info.moss_state = 0; + info.is_smime = 0; info.is_pkcs7 = 0; } else @@ -760,6 +794,6 @@ main (int argc, char **argv) /* Local Variables: -compile-command: "gcc -Wall -g -o gpgparsemail rfc822parse.c gpgparsemail.c" +compile-command: "gcc -Wall -Wno-pointer-sign -g -o gpgparsemail rfc822parse.c gpgparsemail.c" End: */ diff --git a/tools/rfc822parse.c b/tools/rfc822parse.c index efa197dda..8fbe3c283 100644 --- a/tools/rfc822parse.c +++ b/tools/rfc822parse.c @@ -1251,6 +1251,6 @@ main (int argc, char **argv) /* Local Variables: -compile-command: "gcc -Wall -g -DTESTING -o rfc822parse rfc822parse.c" +compile-command: "gcc -Wall -Wno-pointer-sign -g -DTESTING -o rfc822parse rfc822parse.c" End: */