[packages/mutt/mutt-1.5.22] partial update to 1.5.22
draenog
draenog at pld-linux.org
Mon Oct 21 19:22:57 CEST 2013
commit ba020115dd0be1cec51da929a0548dd46fe538f3
Author: Kacper Kornet <draenog at pld-linux.org>
Date: Mon Oct 21 17:02:16 2013 +0100
partial update to 1.5.22
autoconf.patch | 13 ------
mutt-cd.signatures_menu.patch | 13 +++---
mutt-forcedotlock.patch | 4 +-
mutt-pl.po-update.patch | 100 +++++++++++++++++++++---------------------
mutt-rr.compressed.patch | 4 +-
mutt-vvv.quote.patch | 8 ++--
mutt-xface.patch | 4 +-
mutt.spec | 15 +++----
8 files changed, 73 insertions(+), 88 deletions(-)
---
diff --git a/mutt.spec b/mutt.spec
index d535cef..4339190 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,13 +28,13 @@ Summary(ru.UTF-8): Почтовая клиентская программа Mutt
Summary(tr.UTF-8): Mutt elektronik posta programı
Summary(uk.UTF-8): Поштова клієнтська програма Mutt
Name: mutt
-Version: 1.5.21
-Release: 12
+Version: 1.5.22
+Release: 0.1
Epoch: 6
License: GPL v2+
Group: Applications/Mail
Source0: ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: a29db8f1d51e2f10c070bf88e8a553fd
+# Source0-md5: 48267aba1bc53db636777f4a1ec87cb6
Source1: %{name}.desktop
Source2: %{name}.png
Source3: %{name}.1.pl
@@ -67,8 +67,7 @@ Patch22: %{name}-imap_fast_trash.patch
Patch23: %{name}-db.patch
# http://mutt.org.ua/download/
Patch24: %{name}-vvv.nntp.patch
-Patch25: autoconf.patch
-Patch26: format-security.patch
+Patch25: format-security.patch
URL: http://www.mutt.org/
BuildRequires: autoconf >= 2.54
BuildRequires: automake >= 1.6
@@ -174,12 +173,11 @@ Mutt - це невеликий, але потужний повноекранни
%{?with_imap_recent:%patch18 -p1}
%patch19 -p1
%patch20 -p1
-%patch21 -p1
+# %patch21 -p1
%patch22 -p1
-%patch23 -p1
+# %patch23 -p1
%{?with_nntp:%patch24 -p1}
%patch25 -p1
-%patch26 -p1
# force regeneration (manual.sgml is modified by some patches)
%{__rm} doc/{manual*.html,manual.txt}
@@ -278,6 +276,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pixmapsdir}/mutt.png
%{_mandir}/man1/flea.1*
%{_mandir}/man1/mutt*.1*
+%{_mandir}/man1/pgp*.1*
%{_mandir}/man1/smime_keys.1*
%{_mandir}/man5/mmdf.5*
%{_mandir}/man5/muttrc.5*
diff --git a/autoconf.patch b/autoconf.patch
deleted file mode 100644
index 4375ccb..0000000
--- a/autoconf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mutt-1.5.21/configure.ac.wiget 2012-09-06 00:15:08.572730635 +0200
-+++ mutt-1.5.21/configure.ac 2012-09-06 00:15:55.529396771 +0200
-@@ -27,10 +27,6 @@ AC_MSG_RESULT($mutt_cv_prefix)
-
- AC_PROG_CC
- AC_ISC_POSIX
--AM_C_PROTOTYPES
--if test "x$U" != "x"; then
-- AC_MSG_ERROR(Compiler not ANSI compliant)
--fi
- AC_PROG_CPP
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
diff --git a/mutt-cd.signatures_menu.patch b/mutt-cd.signatures_menu.patch
index 880004e..186bb94 100644
--- a/mutt-cd.signatures_menu.patch
+++ b/mutt-cd.signatures_menu.patch
@@ -179,7 +179,7 @@ diff -pruN2 mutt-1.3.27.orig/protos.h mutt-1.3.27/protos.h
diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
--- mutt-1.3.27.orig/signature.c Thu Jan 1 01:00:00 1970
+++ mutt-1.3.27/signature.c Wed Jan 23 22:35:32 2002
-@@ -0,0 +1,505 @@
+@@ -0,0 +1,504 @@
+/*
+ * Copyright (C) 2001 Cedric Duval <cedricduval at free.fr>
+ *
@@ -352,11 +352,10 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
+
+ SETCOLOR (MT_COLOR_STATUS);
+ mvaddstr (SIG_DISPLAY_LINES + 1, 0, _("-- Signature"));
-+ BKGDSET (MT_COLOR_STATUS);
++ SETCOLOR (MT_COLOR_STATUS);
+ clrtoeol ();
+
-+ BKGDSET (MT_COLOR_NORMAL);
-+ SETCOLOR (MT_COLOR_NORMAL);
++ NORMAL_COLOR;
+}
+
+static void free_sig_list (SIG_LIST **sigs)
@@ -688,12 +687,12 @@ diff -pruN2 mutt-1.3.27.orig/signature.c mutt-1.3.27/signature.c
diff -pruN mutt-1.3.27.orig/PATCHES mutt-1.3.27/PATCHES
--- mutt-1.3.27.orig/PATCHES Mon Nov 26 20:16:52 2001
+++ mutt-1.3.27/PATCHES Thu Dec 6 16:27:55 2001
-@@ -1,0 +1 @@
+@@ -1,0 +2 @@
+patch-1.3.27.cd.signatures_menu.2.1
diff --git a/menu.c b/menu.c
--- a/menu.c
+++ b/menu.c
-@@ -642,7 +640,7 @@
+@@ -642,7 +642,7 @@
mutt_error _("No entries.");
}
@@ -702,7 +701,7 @@ diff --git a/menu.c b/menu.c
{
if (menu->current < menu->max - 1)
{
-@@ -653,7 +651,7 @@
+@@ -653,7 +653,7 @@
mutt_error _("You are on the last entry.");
}
diff --git a/mutt-forcedotlock.patch b/mutt-forcedotlock.patch
index 3c7b4d4..565da4b 100644
--- a/mutt-forcedotlock.patch
+++ b/mutt-forcedotlock.patch
@@ -1,6 +1,6 @@
--- mutt-1.5.15/Makefile.am.orig 2007-06-03 12:32:52.028633000 +0200
+++ mutt-1.5.15/Makefile.am 2007-06-03 13:05:48.801283592 +0200
-@@ -138,9 +138,9 @@
+@@ -154,9 +154,9 @@
rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
fi
@@ -10,6 +10,6 @@
+ if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
+ chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
+ chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
- { echo "Can't fix mutt_dotlock's permissions!" >&2 ; exit 1 ; } \
+ { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
fi
diff --git a/mutt-pl.po-update.patch b/mutt-pl.po-update.patch
index 477d91d..7f35b80 100644
--- a/mutt-pl.po-update.patch
+++ b/mutt-pl.po-update.patch
@@ -9,7 +9,7 @@
# Pre-translation has bean done using PePeSza,
# get it from http://home.elka.pw.edu.pl/~pkolodz2/pepesza.html
#
-@@ -96,18 +98,16 @@
+@@ -97,18 +99,16 @@
msgstr "Zapisz do pliku: "
#: alias.c:361
@@ -28,44 +28,44 @@
-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:973
+ #: attach.c:113 attach.c:245 attach.c:400 attach.c:925
msgid "Can't match nametemplate, continue?"
-@@ -890,12 +890,11 @@
+@@ -902,12 +902,11 @@
- #: crypt-gpgme.c:1286
+ #: crypt-gpgme.c:1276
msgid "aka: "
-msgstr ""
+msgstr "aka: "
- #: crypt-gpgme.c:1297
+ #: crypt-gpgme.c:1287
-#, fuzzy
msgid "created: "
-msgstr "Utworzy� %s?"
+msgstr "utworzony: "
- #: crypt-gpgme.c:1362
+ #: crypt-gpgme.c:1350
msgid "Error getting key information: "
-@@ -906,24 +905,20 @@
+@@ -918,24 +917,20 @@
#. fingerprint and the key validity (which is neither fully or
#. ultimate).
- #: crypt-gpgme.c:1369 crypt-gpgme.c:1384
+ #: crypt-gpgme.c:1357 crypt-gpgme.c:1372
-#, fuzzy
msgid "Good signature from:"
msgstr "Poprawny podpis z�o�ony przez: "
- #: crypt-gpgme.c:1376
+ #: crypt-gpgme.c:1364
-#, fuzzy
msgid "*BAD* signature from:"
-msgstr "Poprawny podpis z�o�ony przez: "
+msgstr "*Z�Y* podpis z�o�ony przez: "
- #: crypt-gpgme.c:1392
+ #: crypt-gpgme.c:1380
-#, fuzzy
msgid "Problem signature from:"
-msgstr "Poprawny podpis z�o�ony przez: "
+msgstr "Problematyczny podpis z�o�ony przez: "
- #: crypt-gpgme.c:1393
+ #: crypt-gpgme.c:1381
-#, fuzzy
msgid " expires: "
-msgstr " aka: "
@@ -73,65 +73,65 @@
#. Note: We don't need a current time output because GPGME avoids
#. such an attack by separating the meta information from the
-@@ -964,9 +959,9 @@
+@@ -976,9 +971,9 @@
"\n"
- #: crypt-gpgme.c:2079
+ #: crypt-gpgme.c:2090
-#, 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:2262
+ #: crypt-gpgme.c:2270
#, c-format
-@@ -1863,9 +1858,8 @@
+@@ -1884,9 +1879,8 @@
msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielko��: %s --]\n"
- #: handler.c:1204
+ #: handler.c:1279
-#, 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:1256
+ #: handler.c:1331
#, c-format
-@@ -1947,7 +1941,6 @@
+@@ -1968,7 +1962,6 @@
msgstr "Nie mo�na otworzy� pliku tymczasowego!"
- #: handler.c:1723
+ #: handler.c:1790
-#, fuzzy
msgid "[-- This is an attachment "
msgstr "[-- Ten za��cznik typu %s/%s "
-@@ -2117,9 +2110,9 @@
+@@ -2138,9 +2131,9 @@
msgstr "Skrzynka zosta�a zamkni�ta"
- #: imap/imap.c:126
+ #: imap/imap.c:125
-#, fuzzy, c-format
+#, c-format
msgid "CREATE failed: %s"
-msgstr "SSL nie powiod�o si�: %s"
+msgstr "Polecenie CREATE nie powiod�o si�: %s"
- #: imap/imap.c:190
+ #: imap/imap.c:189
#, c-format
-@@ -2361,9 +2354,9 @@
+@@ -2383,9 +2376,9 @@
msgstr "%s nie jest ustawiony"
- #: init.c:1909
+ #: init.c:1913
-#, 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:2046
+ #: init.c:2050
#, c-format
-@@ -2527,14 +2520,13 @@
+@@ -2549,14 +2542,13 @@
"Aby zg�osi� b��d, odwied� stron� http://bugs.mutt.org/.\n"
- #: main.c:67
+ #: main.c:69
-#, fuzzy
msgid ""
"Copyright (C) 1996-2009 Michael R. Elkins and others.\n"
@@ -144,15 +144,15 @@
"Program nie jest obj�ty �ADN� gwarancj�; szczeg�y poznasz pisz�c 'mutt -"
"vv'.\n"
"Mutt jest darmowym oprogramowaniem, zapraszamy \n"
-@@ -2542,7 +2534,6 @@
+@@ -2564,7 +2556,6 @@
"vv'.\n"
- #: main.c:73
+ #: main.c:75
-#, fuzzy
msgid ""
"Copyright (C) 1996-2007 Michael R. Elkins <me at mutt.org>\n"
"Copyright (C) 1996-2002 Brandon Long <blong at fiction.net>\n"
-@@ -2556,13 +2547,14 @@
+@@ -2578,13 +2569,14 @@
"Many others not mentioned here contributed code, fixes,\n"
"and suggestions.\n"
msgstr ""
@@ -170,75 +170,75 @@
"\n"
"Wielu innych tw�rc�w, nie wspomnianych tutaj,\n"
"wnios�o wiele nowego kodu, poprawek i sugestii.\n"
-@@ -2603,7 +2595,6 @@
- "1301, USA.\n"
+@@ -2625,7 +2617,6 @@
+ "02110-1301, USA.\n"
- #: main.c:113
+ #: main.c:115
-#, fuzzy
msgid ""
"usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
" mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
-@@ -2735,7 +2726,7 @@
+@@ -2749,7 +2740,7 @@
- #: main.c:852
+ #: main.c:882
msgid "Failed to parse mailto: link\n"
-msgstr ""
+msgstr "Przetwarzanie odno�nika mailto: nie powiod�o si�\n"
- #: main.c:864
+ #: main.c:894
msgid "No recipients specified.\n"
-@@ -2882,9 +2873,8 @@
+@@ -2896,9 +2887,8 @@
msgstr "Sprawdzanie %s..."
- #: mh.c:1332 mh.c:1410
+ #: mh.c:1385 mh.c:1463
-#, 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:1377
+ #: mh.c:1430
msgid "maildir_commit_message(): unable to set time on file"
-@@ -3012,24 +3002,22 @@
+@@ -3026,24 +3016,22 @@
msgstr "Certyfikat serwera utraci� wa�no��"
- #: mutt_ssl.c:780
+ #: mutt_ssl.c:826
-#, 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:790 mutt_ssl.c:799
+ #: mutt_ssl.c:836 mutt_ssl.c:845
-#, 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:813
+ #: mutt_ssl.c:859
-#, 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:854
+ #: mutt_ssl.c:900
-#, 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:932 mutt_ssl_gnutls.c:732
+ #: mutt_ssl.c:978 mutt_ssl_gnutls.c:750
msgid "This certificate belongs to:"
-@@ -3062,7 +3050,7 @@
- #: mutt_ssl.c:875 mutt_ssl_gnutls.c:854
+@@ -3076,7 +3064,7 @@
+ #: mutt_ssl.c:1014 mutt_ssl_gnutls.c:872
#, 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:883 mutt_ssl_gnutls.c:863
+ #: mutt_ssl.c:1022 mutt_ssl_gnutls.c:881
msgid "(r)eject, accept (o)nce, (a)ccept always"
-@@ -4281,7 +4269,7 @@
+@@ -4322,7 +4310,7 @@
#: smtp.c:258
msgid "No from address given"
@@ -247,7 +247,7 @@
#: smtp.c:314
msgid "SMTP session failed: read error"
-@@ -4313,9 +4301,9 @@
+@@ -4350,9 +4338,9 @@
msgstr "Uwierzytelnianie SMTP wymaga SASL"
#: smtp.c:493
diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch
index 11ef6b6..97b6cd2 100644
--- a/mutt-rr.compressed.patch
+++ b/mutt-rr.compressed.patch
@@ -569,7 +569,7 @@ diff -udprP mutt-1.5.19.orig/configure mutt-1.5.19/configure
diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac
--- mutt-1.5.19.orig/configure.ac 2008-11-17 22:15:26.000000000 +0200
+++ mutt-1.5.19/configure.ac 2009-01-06 19:16:04.000000000 +0200
-@@ -789,6 +789,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([
+@@ -807,6 +807,11 @@ AC_ARG_ENABLE(mailtool, AC_HELP_STRING([
AC_DEFINE(SUN_ATTACHMENT,1,[ Define to enable Sun mailtool attachments support. ])
fi])
@@ -578,7 +578,7 @@ diff -udprP mutt-1.5.19.orig/configure.ac mutt-1.5.19/configure.ac
+ AC_DEFINE(USE_COMPRESSED,1,[ Define to enable compressed folders support. ])
+ fi])
+
- AC_ARG_ENABLE(locales-fix, AC_HELP_STRING([--enable-locales-fix], [The result of isprint() is unreliable]),
+ AC_ARG_ENABLE(locales-fix, AS_HELP_STRING([--enable-locales-fix],[The result of isprint() is unreliable]),
[if test x$enableval = xyes; then
AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
diff -udprP mutt-1.5.19.orig/curs_main.c mutt-1.5.19/curs_main.c
diff --git a/mutt-vvv.quote.patch b/mutt-vvv.quote.patch
index 52d0432..00e7c35 100644
--- a/mutt-vvv.quote.patch
+++ b/mutt-vvv.quote.patch
@@ -31,15 +31,15 @@ diff -udprP mutt-1.5.19.orig/handler.c mutt-1.5.19/handler.c
if (istext && s->flags & M_CHARCONV)
{
char *charset = mutt_get_parameter ("charset", b->parameter);
-@@ -1542,7 +1546,7 @@ int mutt_body_handler (BODY *b, STATE *s
+@@ -1617,7 +1621,7 @@ int mutt_body_handler (BODY *b, STATE *s
*/
if ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b))
handler = crypt_pgp_application_pgp_handler;
-- else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
-+ else if (ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
+- else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0)
++ else if (option(OPTREFLOWTEXT) && ascii_strcasecmp ("flowed", mutt_get_parameter ("format", b->parameter)) == 0 && !s->prefix)
handler = rfc3676_handler;
else
- plaintext = 1;
+ handler = text_plain_handler;
diff -udprP mutt-1.5.19.orig/init.h mutt-1.5.19/init.h
--- mutt-1.5.19.orig/init.h 2009-01-05 21:20:53.000000000 +0200
+++ mutt-1.5.19/init.h 2009-01-06 19:40:35.000000000 +0200
diff --git a/mutt-xface.patch b/mutt-xface.patch
index 99f041a..bca5e9f 100644
--- a/mutt-xface.patch
+++ b/mutt-xface.patch
@@ -321,7 +321,7 @@ diff -urp ../MUTT/mutt/muttlib.c mutt/muttlib.c
diff -urp ../MUTT/mutt/pager.c mutt/pager.c
--- ../MUTT/mutt/pager.c 2004-07-18 01:25:28.000000000 +0200
+++ mutt/pager.c 2004-07-21 13:36:34.000000000 +0200
-@@ -1441,6 +1441,66 @@ upNLines (int nlines, struct line_t *inf
+@@ -1527,6 +1527,66 @@ upNLines (int nlines, struct line_t *inf
return cur;
}
@@ -385,7 +385,7 @@ diff -urp ../MUTT/mutt/pager.c mutt/pager.c
+ write(slrnface_fd, "show\n", sizeof "show");
+}
+
- static struct mapping_t PagerHelp[] = {
+ static const struct mapping_t PagerHelp[] = {
{ N_("Exit"), OP_EXIT },
{ N_("PrevPg"), OP_PREV_PAGE },
@@ -1545,6 +1605,9 @@ mutt_pager (const char *banner, const ch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mutt.git/commitdiff/ba020115dd0be1cec51da929a0548dd46fe538f3
More information about the pld-cvs-commit
mailing list