From d47c13712f168e3c12f07a9e2c0023af26f1b15f Mon Sep 17 00:00:00 2001 From: pawelz Date: Sun, 11 Apr 2010 18:03:23 +0000 Subject: [PATCH] - merged DEVEL - that means: up to 1.5.20, dropped pgp_hook patch Changed files: mutt-Muttrc_mbox_path.patch -> 1.3 mutt-bj.status-time.patch -> 1.5 mutt-cd.signatures_menu.patch -> 1.6 mutt-cd.trash_folder.patch -> 1.3 mutt-folder_columns.patch -> 1.6 mutt-forcedotlock.patch -> 1.5 mutt-home_etc.patch -> 1.6 mutt-manual.patch -> 1.8 mutt-pgp_hook.patch -> 1.8 mutt-pl.po-update.patch -> 1.7 mutt-po.patch -> 1.3 mutt-rr.compressed.patch -> 1.14 mutt-vvv.nntp.patch -> 1.12 mutt-vvv.quote.patch -> 1.4 mutt-xface.patch -> 1.3 mutt.desktop -> 1.14 mutt.spec -> 1.225 --- mutt-bj.status-time.patch | 8 +- mutt-home_etc.patch | 4 +- mutt-pgp_hook.patch | 245 -------------------------------------- mutt-pl.po-update.patch | 90 +++++++------- mutt-rr.compressed.patch | 30 +++-- mutt.spec | 49 ++++---- 6 files changed, 90 insertions(+), 336 deletions(-) delete mode 100644 mutt-pgp_hook.patch diff --git a/mutt-bj.status-time.patch b/mutt-bj.status-time.patch index 3351573..2469ccd 100644 --- a/mutt-bj.status-time.patch +++ b/mutt-bj.status-time.patch @@ -1,11 +1,11 @@ diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main.c ---- mutt-1.5.10.orig/curs_main.c 2005-10-07 09:28:10.000000000 +0200 -+++ mutt-1.5.10/curs_main.c 2005-10-07 09:28:24.000000000 +0200 -@@ -559,7 +559,7 @@ +--- mutt-1.5.20.b/curs_main.c 2009-07-14 12:34:25.000000000 +0200 ++++ mutt-1.5.20/curs_main.c 2009-07-14 12:42:41.000000000 +0200 +@@ -556,7 +556,7 @@ menu_redraw_current (menu); } -- if (menu->redraw & REDRAW_STATUS) +- if (menu->redraw & REDRAW_STATUS) + if ((menu->redraw & REDRAW_STATUS) || update_status_time ()) { menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); diff --git a/mutt-home_etc.patch b/mutt-home_etc.patch index 4e0ff81..bed4d8a 100644 --- a/mutt-home_etc.patch +++ b/mutt-home_etc.patch @@ -39,8 +39,8 @@ diff -Nur mutt-1.5.11.orig/doc/mutt.man mutt-1.5.11/doc/mutt.man +++ mutt-1.5.11/doc/mutt.man 2006-05-12 00:58:13.000000000 +0200 @@ -122,6 +122,8 @@ .IP "MAILDIR" - Full path of the user's spool mailbox. Commonly used when the spool - mailbox is a + Full path of the user's spool mailbox if MAIL is unset. Commonly used when the spool + mailbox is a +.IP "HOME_ETC" +Path to alternative configuration directory. .B maildir (5) diff --git a/mutt-pgp_hook.patch b/mutt-pgp_hook.patch deleted file mode 100644 index 8c77a61..0000000 --- a/mutt-pgp_hook.patch +++ /dev/null @@ -1,245 +0,0 @@ ---- crypt-hook-both/PATCHES Dec 2002 17:44:54 -0000 3.6 -+++ crypt-hook-both/PATCHES Feb 2004 13:19:43 -0000 -@@ -0,0 +1,2 @@ -+patch-1.5.6.dw.confirm-crypt-hook.1 -+patch-1.5.6.dw.multiple-crypt-hook.2 ---- mutt-1.5.15/hook.c.orig 2007-06-03 14:10:28.090351677 +0200 -+++ mutt-1.5.15/hook.c 2007-06-03 14:12:17.468584787 +0200 -@@ -139,7 +139,11 @@ int mutt_parse_hook (BUFFER *buf, BUFFER - ptr->rx.not == not && - !mutt_strcmp (pattern.data, ptr->rx.pattern)) - { -+#ifdef M_CRYPTHOOK -+ if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK | M_CRYPTHOOK)) -+#else - if (data & (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK | M_ACCOUNTHOOK | M_REPLYHOOK)) -+#endif - { - /* these hooks allow multiple commands with the same - * pattern, so if we've already seen this pattern/command pair, just -@@ -466,9 +470,25 @@ char *mutt_iconv_hook (const char *chs) - return _mutt_string_hook (chs, M_ICONVHOOK); - } - --char *mutt_crypt_hook (ADDRESS *adr) -+LIST *mutt_crypt_hook (ADDRESS *adr) - { -- return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK); -+ HOOK *hook; -+ LIST *key_list = NULL; -+ -+ if (!adr && !adr->mailbox) -+ return (NULL); -+ -+ for (hook = Hooks; hook; hook = hook->next) -+ { -+ if (!hook->command) -+ continue; -+ if (!(hook->type & M_CRYPTHOOK)) -+ continue; -+ -+ if ((regexec (hook->rx.rx, adr->mailbox, 0, NULL, 0) == 0) ^ hook->rx.not) -+ key_list = mutt_add_list (key_list, hook->command); -+ } -+ return (key_list); - } - - #ifdef USE_SOCKET ---- crypt-hook-both/init.h Feb 2004 17:10:43 -0000 3.43 -+++ crypt-hook-both/init.h Feb 2004 13:19:43 -0000 -@@ -1230,2 +1230,11 @@ struct option_t MuttVars[] = { - */ -+ { "pgp_confirmhook", DT_SYN, R_NONE, UL "crypt_confirmhook", 1 }, -+ { "crypt_confirmhook", DT_BOOL, R_NONE, OPTCRYPTCONFIRMHOOK, 1 }, -+ /* -+ ** .pp -+ ** If set, then you will be prompted for confirmation of keys when using -+ ** the \fIcrypt-hook\fP command. If unset, no such confirmation prompt will -+ ** be presented. This is generally considered unsafe, especially where -+ ** typos are concerned. -+ */ - { "pgp_ignore_subkeys", DT_BOOL, R_NONE, OPTPGPIGNORESUB, 1}, ---- crypt-hook-both/mutt.h Feb 2004 17:10:43 -0000 3.23 -+++ crypt-hook-both/mutt.h Feb 2004 13:19:44 -0000 -@@ -442,2 +442,3 @@ enum - OPTSDEFAULTDECRYPTKEY, -+ OPTCRYPTCONFIRMHOOK, - OPTPGPIGNORESUB, ---- crypt-hook-both/pgp.c Sep 2003 13:03:26 -0000 3.26 -+++ crypt-hook-both/pgp.c Feb 2004 13:19:44 -0000 -@@ -1018,2 +1018,4 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS - size_t keylist_used = 0; -+ LIST *hook_list = NULL; -+ LIST *hook = NULL; - ADDRESS *tmp = NULL, *addr = NULL; -@@ -1051,66 +1053,93 @@ char *pgp_findKeys (ADDRESS *to, ADDRESS - q = p; -- k_info = NULL; - -- if ((keyID = mutt_crypt_hook (p)) != NULL) -+ /* -+ * grab the list of matching hooks (matching on recipient address) -+ * process each entry singly so that auto key selection still works -+ */ -+ hook_list = mutt_crypt_hook (p); -+ hook = hook_list; -+ while (1) - { - int r; -- snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox); -- if ((r = mutt_yesorno (buf, M_YES)) == M_YES) -+ -+ k_info = NULL; -+ key = NULL; -+ -+ if (hook) - { -- if (is_numerical_keyid (keyID)) -+ keyID = (char *)hook->data; -+ snprintf (buf, sizeof (buf), _("Use keyID = \"%s\" for %s?"), keyID, p->mailbox); -+ if (!option(OPTCRYPTCONFIRMHOOK) || (r = mutt_yesorno (buf, M_YES)) == M_YES) - { -- if (strncmp (keyID, "0x", 2) == 0) -- keyID += 2; -- goto bypass_selection; /* you don't see this. */ -+ if (is_numerical_keyid (keyID)) -+ { -+ if (strncmp (keyID, "0x", 2) == 0) -+ keyID += 2; -+ goto bypass_selection; /* you don't see this. */ -+ } -+ -+ /* check for e-mail address */ -+ if ((t = strchr (keyID, '@')) && -+ (addr = rfc822_parse_adrlist (NULL, keyID))) -+ { -+ if (fqdn) rfc822_qualify (addr, fqdn); -+ q = addr; -+ } -+ else -+ k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING); - } -- -- /* check for e-mail address */ -- if ((t = strchr (keyID, '@')) && -- (addr = rfc822_parse_adrlist (NULL, keyID))) -+ else if (r == -1) - { -- if (fqdn) rfc822_qualify (addr, fqdn); -- q = addr; -+ /* -+ * yes, this implies that if one key fails they all do -+ */ -+ FREE (&keylist); -+ rfc822_free_address (&tmp); -+ rfc822_free_address (&addr); -+ mutt_free_list (&hook_list); -+ return NULL; - } -- else -- k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING); - } -- else if (r == -1) -- { -- FREE (&keylist); -- rfc822_free_address (&tmp); -- rfc822_free_address (&addr); -- return NULL; -- } -- } - -- if (k_info == NULL) -- pgp_invoke_getkeys (q); -- -- if (k_info == NULL && (k_info = pgp_getkeybyaddr (q, KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) -- { -- snprintf (buf, sizeof (buf), _("Enter keyID for %s: "), q->mailbox); -+ if (k_info == NULL) -+ pgp_invoke_getkeys (q); - -- if ((key = pgp_ask_for_key (buf, q->mailbox, -- KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) -+ if (k_info == NULL && (k_info = pgp_getkeybyaddr (q, KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) - { -- FREE (&keylist); -- rfc822_free_address (&tmp); -- rfc822_free_address (&addr); -- return NULL; -+ snprintf (buf, sizeof (buf), _("Enter keyID for %s: "), q->mailbox); -+ -+ if ((key = pgp_ask_for_key (buf, q->mailbox, -+ KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) -+ { -+ FREE (&keylist); -+ rfc822_free_address (&tmp); -+ rfc822_free_address (&addr); -+ mutt_free_list (&hook_list); -+ return NULL; -+ } - } -- } -- else -- key = k_info; -+ else -+ key = k_info; - -- keyID = pgp_keyid (key); -+ keyID = pgp_keyid (key); - - bypass_selection: -- keylist_size += mutt_strlen (keyID) + 4; -- safe_realloc (&keylist, keylist_size); -- sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */ -- keyID); -- keylist_used = mutt_strlen (keylist); -+ keylist_size += mutt_strlen (keyID) + 4; -+ safe_realloc (&keylist, keylist_size); -+ sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */ -+ keyID); -+ keylist_used = mutt_strlen (keylist); - -- pgp_free_key (&key); -- rfc822_free_address (&addr); -+ pgp_free_key (&key); -+ rfc822_free_address (&addr); -+ -+ if (!hook_list) -+ break; -+ -+ hook = hook->next; -+ if (!hook) -+ break; -+ -+ } -+ mutt_free_list (&hook_list); - ---- crypt-hook-both/protos.h Feb 2004 17:10:43 -0000 3.19 -+++ crypt-hook-both/protos.h Feb 2004 13:19:44 -0000 -@@ -131,3 +131,3 @@ const char *mutt_get_name (ADDRESS *); - char *mutt_get_parameter (const char *, PARAMETER *); --char *mutt_crypt_hook (ADDRESS *); -+LIST *mutt_crypt_hook (ADDRESS *); - char *mutt_make_date (char *, size_t); ---- crypt-hook-both/doc/manual.xml.head Feb 2004 17:45:33 -0000 3.26 -+++ crypt-hook-both/doc/manual.xml.head Feb 2004 13:19:44 -0000 -@@ -3293,7 +3293,9 @@ - or because, for some reasons, you need to override the key Mutt would - normally use. The crypt-hook command provides a - method by which you can specify the ID of the public key to be used --when encrypting messages to a certain recipient. -+when encrypting messages to a certain recipient. You may use multiple pgp-hook's -+with the same pattern; multiple matching pgp-hook's result in the use of multiple -+keyids for recipient. - - - ---- crypt-hook-both/doc/muttrc.man.head Feb 2004 17:10:43 -0000 3.10 -+++ crypt-hook-both/doc/muttrc.man.head Feb 2004 13:19:44 -0000 -@@ -297,3 +297,6 @@ to a certain recipient. The meaning of - broadly: This can be a different e-mail address, a numerical key ID, --or even just an arbitrary search string. -+or even just an arbitrary search string. You may use multiple -+\fBpgp-hook\fPs with the same \fIpattern\fP; multiple matching -+\fBpgp-hook\fPs result in the use of multiple \fIkey-id\fPs for -+recipient. - .TP diff --git a/mutt-pl.po-update.patch b/mutt-pl.po-update.patch index d264ec4..126b825 100644 --- a/mutt-pl.po-update.patch +++ b/mutt-pl.po-update.patch @@ -1,5 +1,5 @@ ---- mutt-1.5.19/po/pl.po.orig 2009-01-06 01:36:44.000000000 +0100 -+++ mutt-1.5.19/po/pl.po 2009-02-28 21:54:56.268283689 +0100 +--- mutt-1.5.20/po/pl.po.b 2009-06-14 20:54:05.000000000 +0200 ++++ mutt-1.5.20/po/pl.po 2009-07-14 12:30:26.000000000 +0200 @@ -2,6 +2,8 @@ # Polskie teksty dla Mutta 1.x # 1998-2006 Pawe³ Dziekoñski @@ -12,7 +12,7 @@ @@ -10,7 +12,7 @@ "Project-Id-Version: mutt-1.5.17\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2009-01-05 16:36-0800\n" + "POT-Creation-Date: 2009-06-14 11:53-0700\n" -"PO-Revision-Date: 2007-11-02 11:11+0200\n" +"PO-Revision-Date: 2009-02-28 21:54+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" @@ -27,19 +27,19 @@ -msgstr "B³±d podczas próby przegl±dania pliku" +msgstr "B³±d podczas odczytu pliku aliasów" - #: alias.c:382 + #: alias.c:383 msgid "Alias added." msgstr "Alias dodany." - #: alias.c:390 + #: alias.c:391 -#, fuzzy msgid "Error seeking in alias file" -msgstr "B³±d podczas próby przegl±dania pliku" +msgstr "B³±d podczas przemieszczania po pliku aliasów" - #: attach.c:113 attach.c:245 attach.c:477 attach.c:969 + #: attach.c:113 attach.c:245 attach.c:477 attach.c:973 msgid "Can't match nametemplate, continue?" -@@ -865,12 +865,11 @@ +@@ -890,12 +890,11 @@ #: crypt-gpgme.c:1286 msgid "aka: " @@ -54,7 +54,7 @@ #: crypt-gpgme.c:1362 msgid "Error getting key information: " -@@ -881,24 +880,20 @@ +@@ -906,24 +905,20 @@ #. fingerprint and the key validity (which is neither fully or #. ultimate). #: crypt-gpgme.c:1369 crypt-gpgme.c:1384 @@ -82,30 +82,38 @@ #. Note: We don't need a current time output because GPGME avoids #. such an attack by separating the meta information from the -@@ -939,9 +934,9 @@ +@@ -964,9 +959,9 @@ "\n" - #: crypt-gpgme.c:2082 + #: crypt-gpgme.c:2079 -#, fuzzy, c-format +#, c-format msgid "Error extracting key data!\n" -msgstr "B³±d sprawdzania klucza: " +msgstr "B³±d podczas pobierania danych o kluczu!\n" - #: crypt-gpgme.c:2265 + #: crypt-gpgme.c:2262 #, c-format -@@ -1838,9 +1833,8 @@ +@@ -1863,9 +1858,8 @@ msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielko¶æ: %s --]\n" - #: handler.c:1223 + #: handler.c:1204 -#, fuzzy msgid "One or more parts of this message could not be displayed" -msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany." +msgstr "Ostrze¿enie: co najmniej jeden fragment wiadomo¶ci nie móg³ byæ wy¶wietlony" - #: handler.c:1275 + #: handler.c:1256 #, c-format -@@ -2087,9 +2081,9 @@ +@@ -1947,7 +1941,6 @@ + msgstr "Nie mo¿na otworzyæ pliku tymczasowego!" + + #: handler.c:1724 +-#, fuzzy + msgid "[-- This is an attachment " + msgstr "[-- Ten za³±cznik typu %s/%s " + +@@ -2117,9 +2110,9 @@ msgstr "Skrzynka zosta³a zamkniêta" #: imap/imap.c:126 @@ -117,7 +125,7 @@ #: imap/imap.c:190 #, c-format -@@ -2331,9 +2325,9 @@ +@@ -2361,9 +2354,9 @@ msgstr "%s nie jest ustawiony" #: init.c:1926 @@ -129,7 +137,7 @@ #: init.c:2064 #, c-format -@@ -2484,14 +2478,13 @@ +@@ -2527,14 +2520,13 @@ "Aby zg³osiæ b³±d, odwied¼ stronê http://bugs.mutt.org/.\n" #: main.c:67 @@ -145,7 +153,7 @@ "Program nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -" "vv'.\n" "Mutt jest darmowym oprogramowaniem, zapraszamy \n" -@@ -2499,7 +2492,6 @@ +@@ -2542,7 +2534,6 @@ "vv'.\n" #: main.c:73 @@ -153,7 +161,7 @@ msgid "" "Copyright (C) 1996-2007 Michael R. Elkins \n" "Copyright (C) 1996-2002 Brandon Long \n" -@@ -2513,13 +2505,14 @@ +@@ -2556,13 +2547,14 @@ "Many others not mentioned here contributed code, fixes,\n" "and suggestions.\n" msgstr "" @@ -171,7 +179,7 @@ "\n" "Wielu innych twórców, nie wspomnianych tutaj,\n" "wnios³o wiele nowego kodu, poprawek i sugestii.\n" -@@ -2560,7 +2553,6 @@ +@@ -2603,7 +2595,6 @@ "1301, USA.\n" #: main.c:113 @@ -179,84 +187,84 @@ msgid "" "usage: mutt [] [-z] [-f | -yZ]\n" " mutt [] [-x] [-Hi ] [-s ] [-bc ] [-a " -@@ -2687,7 +2679,7 @@ +@@ -2735,7 +2726,7 @@ - #: main.c:848 + #: main.c:852 msgid "Failed to parse mailto: link\n" -msgstr "" +msgstr "Przetwarzanie odno¶nika mailto: nie powiod³o siê\n" - #: main.c:860 + #: main.c:864 msgid "No recipients specified.\n" -@@ -2841,9 +2833,8 @@ +@@ -2882,9 +2873,8 @@ msgstr "Sprawdzanie %s..." - #: mh.c:1314 mh.c:1392 + #: mh.c:1331 mh.c:1409 -#, fuzzy msgid "Could not flush message to disk" -msgstr "Wys³anie listu nie powiod³o siê." +msgstr "Zapisane wiadomo¶ci na dysk nie powiod³o siê." - #: mh.c:1359 + #: mh.c:1376 msgid "maildir_commit_message(): unable to set time on file" -@@ -2971,24 +2962,22 @@ +@@ -3012,24 +3002,22 @@ msgstr "Certyfikat serwera utraci³ wa¿no¶æ" - #: mutt_ssl.c:696 + #: mutt_ssl.c:699 -#, fuzzy msgid "cannot get certificate subject" -msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta" +msgstr "nie mo¿na pobraæ tytu³ certyfikatu" - #: mutt_ssl.c:708 + #: mutt_ssl.c:711 -#, fuzzy msgid "cannot get certificate common name" -msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta" +msgstr "nie mo¿na pobraæ ogólnej nazwy certyfikatu" - #: mutt_ssl.c:717 + #: mutt_ssl.c:720 -#, fuzzy, c-format +#, c-format msgid "certificate owner does not match hostname %s" -msgstr "W³a¶ciciel certyfikatu nie odpowiada nadawcy." +msgstr "w³a¶ciciel certyfikatu nie zgadza siê z hostem %s" - #: mutt_ssl.c:754 + #: mutt_ssl.c:761 -#, fuzzy, c-format +#, c-format msgid "Certificate host check failed: %s" -msgstr "Certyfikat zosta³ zapisany" +msgstr "Weryfikacja hosta certyfikatu nie powiod³a siê: %s" - #: mutt_ssl.c:845 mutt_ssl_gnutls.c:664 + #: mutt_ssl.c:839 mutt_ssl_gnutls.c:732 msgid "This certificate belongs to:" -@@ -3021,7 +3010,7 @@ - #: mutt_ssl.c:881 mutt_ssl_gnutls.c:786 +@@ -3062,7 +3050,7 @@ + #: mutt_ssl.c:875 mutt_ssl_gnutls.c:854 #, c-format msgid "SSL Certificate check (certificate %d of %d in chain)" -msgstr "" +msgstr "Weryfikacja certyfikatu SSL (certyfikat %d z %d w ³añcuchu)" - #: mutt_ssl.c:887 mutt_ssl_gnutls.c:793 + #: mutt_ssl.c:883 mutt_ssl_gnutls.c:863 msgid "(r)eject, accept (o)nce, (a)ccept always" -@@ -4220,7 +4209,7 @@ +@@ -4281,7 +4269,7 @@ - #: smtp.c:228 + #: smtp.c:258 msgid "No from address given" -msgstr "" +msgstr "Brak adresu nadawcy" - #: smtp.c:284 + #: smtp.c:314 msgid "SMTP session failed: read error" -@@ -4244,9 +4233,9 @@ +@@ -4313,9 +4301,9 @@ msgstr "Uwierzytelnianie SMTP wymaga SASL" - #: smtp.c:461 + #: smtp.c:499 -#, fuzzy, c-format +#, c-format msgid "%s authentication failed, trying next method" -msgstr "Uwierzytelnianie SASL nie powiod³o siê" +msgstr "Uwierzytelnianie %s nie powiod³o siê" - #: smtp.c:478 + #: smtp.c:516 msgid "SASL authentication failed" diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch index d61e69b..1528e40 100644 --- a/mutt-rr.compressed.patch +++ b/mutt-rr.compressed.patch @@ -596,32 +596,30 @@ diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -udprP mutt-1.5.19.orig/doc/Makefile.am mutt-1.5.19/doc/Makefile.am ---- mutt-1.5.19.orig/doc/Makefile.am 2009-01-05 21:20:53.000000000 +0200 -+++ mutt-1.5.19/doc/Makefile.am 2009-01-06 19:16:04.000000000 +0200 -@@ -31,7 +31,8 @@ EXTRA_DIST = dotlock.man \ +--- mutt-1.5.20.b/doc/Makefile.am 2009-06-01 04:23:14.000000000 +0200 ++++ mutt-1.5.20/doc/Makefile.am 2009-07-14 12:36:06.000000000 +0200 +@@ -31,7 +31,8 @@ - HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ + CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \ configuration.html mimesupport.html advancedusage.html \ -- optionalfeatures.html tuning.html reference.html miscellany.html -+ optionalfeatures.html tuning.html reference.html miscellany.html \ +- optionalfeatures.html security.html tuning.html reference.html miscellany.html ++ optionalfeatures.html security.html tuning.html reference.html miscellany.html \ + compressed-folders.html - BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) + HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES) -diff -udprP mutt-1.5.19.orig/doc/Makefile.in mutt-1.5.19/doc/Makefile.in ---- mutt-1.5.19.orig/doc/Makefile.in 2009-01-05 21:24:14.000000000 +0200 -+++ mutt-1.5.19/doc/Makefile.in 2009-01-06 19:16:04.000000000 +0200 -@@ -234,7 +234,8 @@ EXTRA_DIST = dotlock.man \ +--- mutt-1.5.20.b/doc/Makefile.in 2009-06-09 08:50:43.000000000 +0200 ++++ mutt-1.5.20/doc/Makefile.in 2009-07-14 12:36:53.000000000 +0200 +@@ -235,7 +235,8 @@ - HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \ + CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \ configuration.html mimesupport.html advancedusage.html \ -- optionalfeatures.html tuning.html reference.html miscellany.html -+ optionalfeatures.html tuning.html reference.html miscellany.html \ +- optionalfeatures.html security.html tuning.html reference.html miscellany.html ++ optionalfeatures.html security.html tuning.html reference.html miscellany.html \ + compressed-folders.html + HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES) BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) - srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \ diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head --- mutt-1.5.19.orig/doc/manual.xml.head 2009-01-05 21:20:53.000000000 +0200 +++ mutt-1.5.19/doc/manual.xml.head 2009-01-06 19:35:41.000000000 +0200 diff --git a/mutt.spec b/mutt.spec index beff632..8b690fa 100644 --- a/mutt.spec +++ b/mutt.spec @@ -1,7 +1,6 @@ # # TODO: # - finish -folder_columns.patch -# - update to 1.5.20. See DEVEL branch # # Conditional build: %bcond_with slang # use slang library instead of ncurses @@ -22,14 +21,13 @@ Summary(ru.UTF-8): Почтовая клиентская программа Mutt Summary(tr.UTF-8): Mutt elektronik posta programı Summary(uk.UTF-8): Поштова клієнтська програма Mutt Name: mutt -# See DEVEL branch for 1.5.20. It is almost ready. -Version: 1.5.19 -Release: 3 +Version: 1.5.20 +Release: 0.1 Epoch: 6 License: GPL v2+ Group: Applications/Mail Source0: ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz -# Source0-md5: 73b3747bc7f7c805921e8d24ebac693f +# Source0-md5: 027cdd9959203de0c3c64149a7ee351c Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.1.pl @@ -46,22 +44,19 @@ Patch7: %{name}-cd.purge_message.patch Patch8: %{name}-cd.signatures_menu.patch # http://www.mutt.ca/patches/ (dw.crypt-autoselectkey) Patch9: %{name}-crypt-autoselectkey.patch -# http://www.mutt.ca/patches/ (dw.crypt-hook-both) -Patch10: %{name}-pgp_hook.patch -Patch11: %{name}-manual.patch -Patch12: %{name}-xface.patch -Patch13: %{name}-Muttrc_mbox_path.patch -Patch14: %{name}-po.patch +Patch10: %{name}-manual.patch +Patch11: %{name}-xface.patch +Patch12: %{name}-Muttrc_mbox_path.patch +Patch13: %{name}-po.patch # http://mutt.org.ua/download/ -Patch15: %{name}-vvv.nntp.patch -Patch16: %{name}-home_etc.patch -Patch17: %{name}-Muttrc.patch -Patch18: %{name}-muttbug-tmp.patch -Patch19: %{name}-folder_columns.patch -Patch20: %{name}-imap_mxcmp.patch -Patch21: %{name}-imap_recent.patch -Patch22: %{name}-Muttrc.head.patch -Patch23: %{name}-smime.rc.patch +Patch14: %{name}-vvv.nntp.patch +Patch15: %{name}-home_etc.patch +Patch16: %{name}-Muttrc.patch +Patch17: %{name}-muttbug-tmp.patch +Patch18: %{name}-folder_columns.patch +Patch19: %{name}-imap_recent.patch +Patch20: %{name}-Muttrc.head.patch +Patch21: %{name}-smime.rc.patch URL: http://www.mutt.org/ BuildRequires: autoconf BuildRequires: automake @@ -158,17 +153,15 @@ Mutt - це невеликий, але потужний повноекранни %patch11 -p1 %patch12 -p1 %patch13 -p1 -%patch14 -p1 -%{?with_nntp:%patch15 -p1} -%{?with_home_etc:%patch16 -p1} +%{?with_nntp:%patch14 -p1} +%{?with_home_etc:%patch15 -p1} +%patch16 -p1 %patch17 -p1 -%patch18 -p1 # breaks display if arrow_cursor is set -%{?with_folder_column:%patch19 -p1} +%{?with_folder_column:%patch18 -p1} +%{?with_imap_recent:%patch19 -p1} %patch20 -p1 -%{?with_imap_recent:%patch21 -p1} -%patch22 -p1 -%patch23 -p1 +%patch21 -p1 # force regeneration (manual.sgml is modified by some patches) rm -f doc/{manual*.html,manual.txt} -- 2.43.0