From ee758747bdd4aa7b2ee57d79e9efc67b46ce368b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 6 Oct 2010 17:52:50 +0000 Subject: [PATCH] - 1.5.21 Changed files: mutt-Muttrc.patch -> 1.5 mutt-from_folding.patch -> 1.2 mutt-home_etc.patch -> 1.7 mutt-openssl.patch -> 1.2 mutt-pl.po-update.patch -> 1.8 mutt-rr.compressed.patch -> 1.15 mutt.spec -> 1.230 --- mutt-Muttrc.patch | 2 +- mutt-from_folding.patch | 12 ------------ mutt-home_etc.patch | 6 +++--- mutt-openssl.patch | 11 ----------- mutt-pl.po-update.patch | 33 ++++++++++++--------------------- mutt-rr.compressed.patch | 12 ++++++------ mutt.spec | 10 +++------- 7 files changed, 25 insertions(+), 61 deletions(-) delete mode 100644 mutt-from_folding.patch delete mode 100644 mutt-openssl.patch diff --git a/mutt-Muttrc.patch b/mutt-Muttrc.patch index c655ff0..982483a 100644 --- a/mutt-Muttrc.patch +++ b/mutt-Muttrc.patch @@ -92,7 +92,7 @@ diff -urN mutt-1.5.19/doc/Muttrc mutt-1.5.19.conf/doc/Muttrc @@ -4436,6 +4448,7 @@ # # - # set thorough_search=no + # set thorough_search=yes +set thorough_search=yes # # Name: thorough_search diff --git a/mutt-from_folding.patch b/mutt-from_folding.patch deleted file mode 100644 index 6c7007a..0000000 --- a/mutt-from_folding.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNp mutt-1.5.20.orig/sendlib.c mutt-1.5.20/sendlib.c ---- mutt-1.5.20.orig/sendlib.c 2009-06-14 17:46:11.000000000 +0200 -+++ mutt-1.5.20/sendlib.c 2010-09-11 11:49:12.000000000 +0200 -@@ -1737,7 +1737,7 @@ static int write_one_header (FILE *fp, i - } - else - { -- t = strchr (start, ':'); -+ if(strncmp("From ",start,5)==0) t = strchr (start, ' '); else t = strchr (start, ':'); - tagbuf = mutt_substrdup (start, t); - valbuf = mutt_substrdup (t + 2, end); - dprint(4,(debugfile,"mwoh: buf[%s%s] too long, " diff --git a/mutt-home_etc.patch b/mutt-home_etc.patch index bed4d8a..9c24e23 100644 --- a/mutt-home_etc.patch +++ b/mutt-home_etc.patch @@ -173,9 +173,9 @@ diff -Nur mutt-1.5.11.orig/mutt_ssl.c mutt-1.5.11/mutt_ssl.c +# define H_CFDIR Homedir +#endif + - typedef struct _sslsockdata - { - SSL_CTX *ctx; + /* keep a handle on accepted certificates in case we want to + * open up another connection to the same server in this session */ + static STACK_OF(X509) *SslSessionCerts = NULL; @@ -162,7 +169,7 @@ /* load entropy from egd sockets */ #ifdef HAVE_RAND_EGD diff --git a/mutt-openssl.patch b/mutt-openssl.patch deleted file mode 100644 index 862464f..0000000 --- a/mutt-openssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200 -+++ b/mutt_ssl.c 2010-04-02 01:42:55.000000000 +0200 -@@ -652,7 +652,7 @@ - char *buf = NULL; - int bufsize; - /* needed to get the DNS subjectAltNames: */ -- STACK *subj_alt_names; -+ STACK_OF(X509) *subj_alt_names; - int subj_alt_names_count; - GENERAL_NAME *subj_alt_name; - /* did we find a name matching hostname? */ diff --git a/mutt-pl.po-update.patch b/mutt-pl.po-update.patch index 126b825..477d91d 100644 --- a/mutt-pl.po-update.patch +++ b/mutt-pl.po-update.patch @@ -9,15 +9,6 @@ # Pre-translation has bean done using PePeSza, # get it from http://home.elka.pw.edu.pl/~pkolodz2/pepesza.html # -@@ -10,7 +12,7 @@ - "Project-Id-Version: mutt-1.5.17\n" - "Report-Msgid-Bugs-To: \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" - "Language-Team: POLISH \n" - "MIME-Version: 1.0\n" @@ -96,18 +98,16 @@ msgstr "Zapisz do pliku: " @@ -108,7 +99,7 @@ @@ -1947,7 +1941,6 @@ msgstr "Nie mo¿na otworzyæ pliku tymczasowego!" - #: handler.c:1724 + #: handler.c:1723 -#, fuzzy msgid "[-- This is an attachment " msgstr "[-- Ten za³±cznik typu %s/%s " @@ -128,14 +119,14 @@ @@ -2361,9 +2354,9 @@ msgstr "%s nie jest ustawiony" - #: init.c:1926 + #: init.c:1909 -#, fuzzy, c-format +#, c-format msgid "Invalid value for option %s: \"%s\"" -msgstr "Niew³a¶ciwy dzieñ miesi±ca: %s" +msgstr "Niew³a¶ciwy warto¶æ dla opcji %s: \"%s\"" - #: init.c:2064 + #: init.c:2046 #, c-format @@ -2527,14 +2520,13 @@ "Aby zg³osiæ b³±d, odwied¼ stronê http://bugs.mutt.org/.\n" @@ -199,44 +190,44 @@ @@ -2882,9 +2873,8 @@ msgstr "Sprawdzanie %s..." - #: mh.c:1331 mh.c:1409 + #: mh.c:1332 mh.c:1410 -#, 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:1376 + #: mh.c:1377 msgid "maildir_commit_message(): unable to set time on file" @@ -3012,24 +3002,22 @@ msgstr "Certyfikat serwera utraci³ wa¿no¶æ" - #: mutt_ssl.c:699 + #: mutt_ssl.c:780 -#, 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:711 + #: mutt_ssl.c:790 mutt_ssl.c:799 -#, 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:720 + #: mutt_ssl.c:813 -#, 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:761 + #: mutt_ssl.c:854 -#, 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:839 mutt_ssl_gnutls.c:732 + #: mutt_ssl.c:932 mutt_ssl_gnutls.c:732 msgid "This certificate belongs to:" @@ -3062,7 +3050,7 @@ #: mutt_ssl.c:875 mutt_ssl_gnutls.c:854 @@ -259,12 +250,12 @@ @@ -4313,9 +4301,9 @@ msgstr "Uwierzytelnianie SMTP wymaga SASL" - #: smtp.c:499 + #: smtp.c:493 -#, 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:516 + #: smtp.c:510 msgid "SASL authentication failed" diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch index 1528e40..c49bf42 100644 --- a/mutt-rr.compressed.patch +++ b/mutt-rr.compressed.patch @@ -919,7 +919,7 @@ diff -udprP mutt-1.5.19.orig/doc/manual.xml.head mutt-1.5.19/doc/manual.xml.head + + + - auto-view + auto_view mimetype @@ -7007,6 +7285,18 @@ The following are the commands understoo @@ -1052,8 +1052,8 @@ diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, + { "append-hook", mutt_parse_hook, M_APPENDHOOK }, +#endif - { "group", parse_group, 0 }, - { "ungroup", parse_ungroup, 0 }, + { "group", parse_group, M_GROUP }, + { "ungroup", parse_ungroup, M_UNGROUP }, { "hdr_order", parse_list, UL &HeaderOrderList }, diff -udprP mutt-1.5.19.orig/main.c mutt-1.5.19/main.c --- mutt-1.5.19.orig/main.c 2009-01-04 01:27:10.000000000 +0200 @@ -1262,9 +1262,9 @@ diff -udprP mutt-1.5.19.orig/mx.h mutt-1.5.19/mx.h --- mutt-1.5.19.orig/mx.h 2008-03-19 22:07:06.000000000 +0200 +++ mutt-1.5.19/mx.h 2009-01-06 19:16:04.000000000 +0200 @@ -40,6 +40,9 @@ enum - #ifdef USE_POP - , M_POP - #endif + M_MAILDIR, + M_IMAP, + M_POP +#ifdef USE_COMPRESSED + , M_COMPRESSED +#endif diff --git a/mutt.spec b/mutt.spec index a6f0562..fb614c2 100644 --- a/mutt.spec +++ b/mutt.spec @@ -21,13 +21,13 @@ Summary(ru.UTF-8): Почтовая клиентская программа Mutt Summary(tr.UTF-8): Mutt elektronik posta programı Summary(uk.UTF-8): Поштова клієнтська програма Mutt Name: mutt -Version: 1.5.20 -Release: 2 +Version: 1.5.21 +Release: 1 Epoch: 6 License: GPL v2+ Group: Applications/Mail Source0: ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz -# Source0-md5: 027cdd9959203de0c3c64149a7ee351c +# Source0-md5: a29db8f1d51e2f10c070bf88e8a553fd Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.1.pl @@ -57,8 +57,6 @@ Patch18: %{name}-folder_columns.patch Patch19: %{name}-imap_recent.patch Patch20: %{name}-Muttrc.head.patch Patch21: %{name}-smime.rc.patch -Patch22: %{name}-openssl.patch -Patch23: %{name}-from_folding.patch URL: http://www.mutt.org/ BuildRequires: autoconf BuildRequires: automake @@ -164,8 +162,6 @@ Mutt - це невеликий, але потужний повноекранни %{?with_imap_recent:%patch19 -p1} %patch20 -p1 %patch21 -p1 -%patch22 -p1 -%patch23 -p1 # force regeneration (manual.sgml is modified by some patches) rm -f doc/{manual*.html,manual.txt} -- 2.43.0