--- mutt-1.3.27/PATCHES Fri Jan 11 08:33:08 2002 +++ mutt-1.3.27/PATCHES Tue Jan 22 11:43:59 2002 @@ -0,0 +1 @@ +patch-1.3.27.dw.pgp-traditional.2 --- mutt-1.3.27/init.h Fri Jan 11 08:33:07 2002 +++ mutt-1.3.27/init.h Sun Jan 20 09:03:10 2002 @@ -1300,8 +1300,8 @@ ** a character set different from us-ascii, or which consist of more than ** a single MIME part. ** .pp - ** Also note that using the old-style PGP message format is \fBstrongly\fP - ** \fBdeprecated\fP. + ** Please note that this format now uses text/plain instead of application/pgp + ** as the content type. */ /* XXX Default values! */ --- mutt-1.3.27/muttlib.c Fri Jan 11 08:33:06 2002 +++ mutt-1.3.27/muttlib.c Sun Jan 20 09:03:11 2002 @@ -104,8 +104,6 @@ char tmp[_POSIX_PATH_MAX]; BODY *b; - PARAMETER *par, **ppar; - short use_disp; if (src->filename) @@ -151,13 +149,7 @@ if (b->hdr) b->hdr = NULL; - /* copy parameters */ - for (par = b->parameter, ppar = &b->parameter; par; ppar = &(*ppar)->next, par = par->next) - { - *ppar = mutt_new_parameter (); - (*ppar)->attribute = safe_strdup (par->attribute); - (*ppar)->value = safe_strdup (par->value); - } + mutt_copy_parameter (&b->parameter, b->parameter); mutt_stamp_attachment (b); @@ -201,6 +193,18 @@ *p = 0; } + + +void mutt_copy_parameter (PARAMETER **tgt, PARAMETER *src) +{ + for (; src; tgt = &(*tgt)->next, src = src->next) + { + *tgt = mutt_new_parameter (); + (*tgt)->attribute = safe_strdup (src->attribute); + (*tgt)->value = safe_strdup (src->value); + } +} + void mutt_free_parameter (PARAMETER **p) { --- mutt-1.3.27/pgp.c Fri Jan 18 08:32:14 2002 +++ mutt-1.3.27/pgp.c Tue Jan 22 11:43:17 2002 @@ -1646,25 +1646,22 @@ b = mutt_new_body (); - b->encoding = ENC7BIT; - - b->type = TYPEAPPLICATION; - b->subtype = safe_strdup ("pgp"); - - mutt_set_parameter ("format", "text", &b->parameter); - mutt_set_parameter ("x-action", flags & PGPENCRYPT ? "encrypt" : "sign", - &b->parameter); + /* + * preserve parameters and encoding for new body + */ + mutt_copy_parameter (&b->parameter, a->parameter); + b->encoding = a->encoding; - b->filename = safe_strdup (pgpoutfile); - - /* The following is intended to give a clue to some completely brain-dead - * "mail environments" which are typically used by large corporations. + /* + * application/pgp was withdrawn...so we encode using text/plain now */ + b->type = TYPETEXT; + b->subtype = safe_strdup ("plain"); - b->d_filename = safe_strdup ("msg.pgp"); + b->filename = safe_strdup (pgpoutfile); + b->use_disp = 0; b->disposition = DISPINLINE; b->unlink = 1; - b->use_disp = 1; return b; } @@ -1701,10 +1698,9 @@ return (-1); if ((msg->content->type == TYPETEXT) && - !ascii_strcasecmp (msg->content->subtype, "plain") && - ((flags & PGPENCRYPT) || (msg->content->content && msg->content->content->hibin == 0))) + !ascii_strcasecmp (msg->content->subtype, "plain")) { - if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create an application/pgp message?"))) == -1) + if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create a text/plain pgp message?"))) == -1) return -1; else if (i == M_YES) traditional = 1; --- mutt-1.3.27/protos.h Fri Jan 18 08:32:15 2002 +++ mutt-1.3.27/protos.h Sun Jan 20 09:03:11 2002 @@ -257,6 +257,7 @@ int mutt_complete (char *, size_t); int mutt_compose_attachment (BODY *a); int mutt_copy_body (FILE *, BODY **, BODY *); +void mutt_copy_parameter (PARAMETER **, PARAMETER *); int mutt_decode_save_attachment (FILE *, BODY *, char *, int, int); int mutt_display_message (HEADER *h); int mutt_edit_attachment(BODY *); --- mutt-1.3.27/send.c Fri Jan 11 08:33:06 2002 +++ mutt-1.3.27/send.c Sun Jan 20 09:03:11 2002 @@ -1439,7 +1439,7 @@ * - multipart/signed. In this case, clear_content is a child. * - multipart/encrypted. In this case, clear_content exists * independently - * - application/pgp. In this case, clear_content exists independently. + * - text/plain (and enc/sig with pgp trad.). clear_context exists ind. * - something else. In this case, it's the same as clear_content. */ @@ -1558,7 +1558,7 @@ { #ifdef HAVE_PGP if ((msg->pgp & PGPENCRYPT) || - ((msg->pgp & PGPSIGN) && msg->content->type == TYPEAPPLICATION)) + ((msg->pgp & PGPSIGN) && msg->content->type == TYPETEXT)) { mutt_free_body (&msg->content); /* destroy PGP data */ msg->content = clear_content; /* restore clear text. */ --- mutt-1.3.27/doc/muttrc.man Fri Jan 18 12:29:26 2002 +++ mutt-1.3.27/doc/muttrc.man Sun Jan 20 09:03:14 2002 @@ -2415,8 +2415,8 @@ a character set different from us-ascii, or which consist of more than a single MIME part. .IP -Also note that using the old-style PGP message format is \fBstrongly\fP -\fBdeprecated\fP. +Please note that this format now uses text/plain instead of application/pgp +as the content type. .TP --- mutt-1.3.27/po/ca.po Fri Jan 18 08:32:31 2002 +++ mutt-1.3.27/po/ca.po Tue Jan 22 11:43:18 2002 @@ -3310,8 +3310,8 @@ msgstr "No s'ha pogut invocar PGP." #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Voleu crear un missatge application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Voleu crear un missatge text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/cs.po Fri Jan 18 08:32:22 2002 +++ mutt-1.3.27/po/cs.po Tue Jan 22 11:43:18 2002 @@ -3813,8 +3813,8 @@ # #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "vytvoit zprvu typu 'application/pgp'?" +msgid "Create a text/plain pgp message?" +msgstr "vytvoit zprvu typu 'text/plain pgp'?" # #: pgpinvoke.c:301 --- mutt-1.3.27/po/da.po Fri Jan 18 08:32:29 2002 +++ mutt-1.3.27/po/da.po Tue Jan 22 11:43:19 2002 @@ -3165,8 +3165,8 @@ msgstr "Kan ikke starte PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Lav et \"application/pgp\"-brev?" +msgid "Create a text/plain pgp message?" +msgstr "Lav et \"text/plain pgp\"-brev?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/de.po Fri Jan 18 08:32:16 2002 +++ mutt-1.3.27/po/de.po Tue Jan 22 11:47:28 2002 @@ -3180,8 +3180,8 @@ msgstr "Kann PGP nicht aufrufen" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Erzeuge application/pgp Nachricht (statt RFC 2015)?" +msgid "Create a text/plain pgp message?" +msgstr "Erzeuge text/plain pgp Nachricht (statt RFC 3156)?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/el.po Fri Jan 18 08:32:25 2002 +++ mutt-1.3.27/po/el.po Tue Jan 22 11:43:21 2002 @@ -3865,8 +3865,8 @@ # #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr " application/pgp ;" +msgid "Create a text/plain pgp message?" +msgstr " text/plain pgp ;" # #: pgpinvoke.c:301 --- mutt-1.3.27/po/eo.po Fri Jan 18 08:32:27 2002 +++ mutt-1.3.27/po/eo.po Tue Jan 22 11:43:22 2002 @@ -3168,8 +3168,8 @@ msgstr "Ne povas alvoki PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "u krei application/pgp-mesaon?" +msgid "Create a text/plain pgp message?" +msgstr "u krei text/plain pgp-mesaon?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/es.po Fri Jan 18 08:32:19 2002 +++ mutt-1.3.27/po/es.po Tue Jan 22 11:43:22 2002 @@ -3202,8 +3202,8 @@ msgstr "No se pudo invocar PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Crear un mensaje de tipo application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Crear un mensaje de tipo text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/et.po Fri Jan 18 08:32:30 2002 +++ mutt-1.3.27/po/et.po Tue Jan 22 11:43:23 2002 @@ -3169,8 +3169,8 @@ msgstr "PGP kivitamine ei nnestu" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Loon application/pgp teade?" +msgid "Create a text/plain pgp message?" +msgstr "Loon text/plain pgp teade?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/fr.po Fri Jan 18 08:32:20 2002 +++ mutt-1.3.27/po/fr.po Tue Jan 22 11:43:23 2002 @@ -3310,8 +3310,8 @@ msgstr "Impossible d'invoquer PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Crer un message application/pgp ?" +msgid "Create a text/plain pgp message?" +msgstr "Crer un message text/plain pgp ?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/gl.po Fri Jan 18 08:32:28 2002 +++ mutt-1.3.27/po/gl.po Tue Jan 22 11:43:24 2002 @@ -3207,8 +3207,8 @@ msgstr "Non foi posible invocar PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Crear unha mensaxe aplicacin/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Crear unha mensaxe text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/hu.po Fri Jan 18 08:32:30 2002 +++ mutt-1.3.27/po/hu.po Tue Jan 22 11:43:25 2002 @@ -3298,7 +3298,7 @@ msgstr "PGP-t nem tudom meghvni" #: pgp.c:1707 -msgid "Create an application/pgp message?" +msgid "Create a text/plain pgp message?" msgstr "" #: pgpinvoke.c:301 --- mutt-1.3.27/po/id.po Fri Jan 18 08:32:23 2002 +++ mutt-1.3.27/po/id.po Tue Jan 22 11:43:26 2002 @@ -3178,8 +3178,8 @@ msgstr "Tidak dapat menjalankan PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Buat surat application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Buat surat text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/it.po Fri Jan 18 08:32:18 2002 +++ mutt-1.3.27/po/it.po Tue Jan 22 11:43:26 2002 @@ -3168,8 +3168,8 @@ msgstr "Impossibile eseguire PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Creo un messaggio application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Creo un messaggio text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/ja.po Fri Jan 18 08:32:30 2002 +++ mutt-1.3.27/po/ja.po Tue Jan 22 11:43:28 2002 @@ -3146,8 +3146,8 @@ msgstr "PGPưǤʤ" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "application/pgpå뤫?" +msgid "Create a text/plain pgp message?" +msgstr "text/plain pgpå뤫?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/ko.po Fri Jan 18 08:32:24 2002 +++ mutt-1.3.27/po/ko.po Tue Jan 22 11:43:28 2002 @@ -3164,8 +3164,8 @@ msgstr "PGP " #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "application/pgp ?" +msgid "Create a text/plain pgp message?" +msgstr "text/plain pgp ?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/lt.po Fri Jan 18 08:32:29 2002 +++ mutt-1.3.27/po/lt.po Tue Jan 22 11:43:29 2002 @@ -3210,8 +3210,8 @@ msgstr "Negaliu kviesti PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Ar sukurti application/pgp laik?" +msgid "Create a text/plain pgp message?" +msgstr "Ar sukurti text/plain pgp laik?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/nl.po Fri Jan 18 08:32:21 2002 +++ mutt-1.3.27/po/nl.po Tue Jan 22 11:43:29 2002 @@ -3169,8 +3169,8 @@ msgstr "Kan PGP niet aanroepen" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Een application/pgp bericht aanmaken?" +msgid "Create a text/plain pgp message?" +msgstr "Een text/plain pgp bericht aanmaken?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/pl.po Fri Jan 18 08:32:20 2002 +++ mutt-1.3.27/po/pl.po Tue Jan 22 11:43:31 2002 @@ -3181,8 +3181,8 @@ msgstr "Nie mona wywoa PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Utworzy list/zacznik typu application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Utworzy list/zacznik typu text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/pt_BR.po Fri Jan 18 08:32:26 2002 +++ mutt-1.3.27/po/pt_BR.po Tue Jan 22 11:43:32 2002 @@ -3238,8 +3238,8 @@ msgstr "No foi possvel executar o PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Criar uma mensagem application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr "Criar uma mensagem text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/ru.po Fri Jan 18 08:32:18 2002 +++ mutt-1.3.27/po/ru.po Tue Jan 22 11:43:33 2002 @@ -3196,8 +3196,8 @@ msgstr " PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr " application/pgp?" +msgid "Create a text/plain pgp message?" +msgstr " text/plain pgp?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/sk.po Fri Jan 18 08:32:24 2002 +++ mutt-1.3.27/po/sk.po Tue Jan 22 11:43:34 2002 @@ -3253,7 +3253,7 @@ #: pgp.c:1707 #, fuzzy -msgid "Create an application/pgp message?" +msgid "Create a text/plain pgp message?" msgstr "vytvori zstupcu z odosielatea sprvy" #: pgpinvoke.c:301 --- mutt-1.3.27/po/sv.po Fri Jan 18 08:32:28 2002 +++ mutt-1.3.27/po/sv.po Tue Jan 22 11:43:35 2002 @@ -3178,8 +3178,8 @@ msgstr "Kan inte starta PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "Skapa ett meddelande av typ 'application/pgp'?" +msgid "Create a text/plain pgp message?" +msgstr "Skapa ett meddelande av typ 'text/plain pgp'?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/tr.po Fri Jan 18 08:32:30 2002 +++ mutt-1.3.27/po/tr.po Tue Jan 22 11:43:36 2002 @@ -3189,8 +3189,8 @@ msgstr "PGP altrlamyor" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "application/pgp iletisi yaratlsn m?" +msgid "Create a text/plain pgp message?" +msgstr "text/plain pgp iletisi yaratlsn m?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/uk.po Fri Jan 18 08:32:19 2002 +++ mutt-1.3.27/po/uk.po Tue Jan 22 11:43:36 2002 @@ -3157,8 +3157,8 @@ msgstr " PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr " application/pgp ?" +msgid "Create a text/plain pgp message?" +msgstr " text/plain pgp ?" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/zh_CN.po Fri Jan 18 08:32:26 2002 +++ mutt-1.3.27/po/zh_CN.po Tue Jan 22 11:43:37 2002 @@ -3250,8 +3250,8 @@ msgstr "ִ PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "һ application/pgp ż" +msgid "Create a text/plain pgp message?" +msgstr "һ text/plain pgp ż" #: pgpinvoke.c:301 msgid "Fetching PGP key..." --- mutt-1.3.27/po/zh_TW.po Fri Jan 18 08:32:26 2002 +++ mutt-1.3.27/po/zh_TW.po Tue Jan 22 11:43:37 2002 @@ -3191,8 +3191,8 @@ msgstr "不能執行 PGP" #: pgp.c:1707 -msgid "Create an application/pgp message?" -msgstr "建立一封 application/pgp 的信件？" +msgid "Create a text/plain pgp message?" +msgstr "建立一封 text/plain pgp 的信件？" #: pgpinvoke.c:301 msgid "Fetching PGP key..."