packages: mutt/mutt-Muttrc.patch, mutt/mutt-home_etc.patch, mutt/mutt-pl.po...
baggins
baggins at pld-linux.org
Wed Oct 6 19:52:57 CEST 2010
Author: baggins Date: Wed Oct 6 17:52:57 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.5.21
---- Files affected:
packages/mutt:
mutt-Muttrc.patch (1.4 -> 1.5) , mutt-home_etc.patch (1.6 -> 1.7) , mutt-pl.po-update.patch (1.7 -> 1.8) , mutt-rr.compressed.patch (1.14 -> 1.15) , mutt.spec (1.229 -> 1.230) , mutt-from_folding.patch (1.1 -> NONE) (REMOVED), mutt-openssl.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mutt/mutt-Muttrc.patch
diff -u packages/mutt/mutt-Muttrc.patch:1.4 packages/mutt/mutt-Muttrc.patch:1.5
--- packages/mutt/mutt-Muttrc.patch:1.4 Mon Apr 13 19:52:00 2009
+++ packages/mutt/mutt-Muttrc.patch Wed Oct 6 19:52:50 2010
@@ -92,7 +92,7 @@
@@ -4436,6 +4448,7 @@
#
#
- # set thorough_search=no
+ # set thorough_search=yes
+set thorough_search=yes
#
# Name: thorough_search
================================================================
Index: packages/mutt/mutt-home_etc.patch
diff -u packages/mutt/mutt-home_etc.patch:1.6 packages/mutt/mutt-home_etc.patch:1.7
--- packages/mutt/mutt-home_etc.patch:1.6 Sun Apr 11 20:03:23 2010
+++ packages/mutt/mutt-home_etc.patch Wed Oct 6 19:52:50 2010
@@ -173,9 +173,9 @@
+# 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
================================================================
Index: packages/mutt/mutt-pl.po-update.patch
diff -u packages/mutt/mutt-pl.po-update.patch:1.7 packages/mutt/mutt-pl.po-update.patch:1.8
--- packages/mutt/mutt-pl.po-update.patch:1.7 Sun Apr 11 20:03:23 2010
+++ packages/mutt/mutt-pl.po-update.patch Wed Oct 6 19:52:50 2010
@@ -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 <dzieko at gmail.com>\n"
- "Language-Team: POLISH <pl at li.org>\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"
================================================================
Index: packages/mutt/mutt-rr.compressed.patch
diff -u packages/mutt/mutt-rr.compressed.patch:1.14 packages/mutt/mutt-rr.compressed.patch:1.15
--- packages/mutt/mutt-rr.compressed.patch:1.14 Sun Apr 11 20:03:23 2010
+++ packages/mutt/mutt-rr.compressed.patch Wed Oct 6 19:52:50 2010
@@ -919,7 +919,7 @@
+
+<listitem>
+<cmdsynopsis>
- <command><link linkend="auto-view">auto-view</link></command>
+ <command><link linkend="auto-view">auto_view</link></command>
<arg choice="plain">
<replaceable>mimetype</replaceable>
@@ -7007,6 +7285,18 @@ The following are the commands understoo
@@ -1052,8 +1052,8 @@
+ { "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 @@
--- 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
================================================================
Index: packages/mutt/mutt.spec
diff -u packages/mutt/mutt.spec:1.229 packages/mutt/mutt.spec:1.230
--- packages/mutt/mutt.spec:1.229 Sat Sep 11 11:58:25 2010
+++ packages/mutt/mutt.spec Wed Oct 6 19:52:50 2010
@@ -22,13 +22,13 @@
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
@@ -58,8 +58,6 @@
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
@@ -165,8 +163,6 @@
%{?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}
@@ -271,6 +267,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.230 2010/10/06 17:52:50 baggins
+- 1.5.21
+
Revision 1.229 2010/09/11 09:58:25 gotar
- fixed From_ line folding, rel. 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-Muttrc.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-home_etc.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-pl.po-update.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-rr.compressed.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt.spec?r1=1.229&r2=1.230&f=u
More information about the pld-cvs-commit
mailing list