packages (DEVEL): mutt/mutt-bj.status-time.patch, mutt/mutt-pl.po-update.pa...

pawelz pawelz at pld-linux.org
Tue Jul 14 14:31:20 CEST 2009 

Author: pawelz                       Date: Tue Jul 14 12:31:20 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 1.5.20
- commented out pgp_hook patch (see TODO)
- dropped imap_mxcmp patch (no longer needed)
- pl.po-updated needs some more work
- updated bj.status-time and rr.compressed patches

---- Files affected:
packages/mutt:
   mutt-bj.status-time.patch (1.1.4.2 -> 1.1.4.3) , mutt-pl.po-update.patch (1.1.2.4 -> 1.1.2.5) , mutt-rr.compressed.patch (1.4.4.9 -> 1.4.4.10) , mutt.spec (1.222 -> 1.222.2.1) 

---- Diffs:

================================================================
Index: packages/mutt/mutt-bj.status-time.patch
diff -u packages/mutt/mutt-bj.status-time.patch:1.1.4.2 packages/mutt/mutt-bj.status-time.patch:1.1.4.3
--- packages/mutt/mutt-bj.status-time.patch:1.1.4.2	Tue Jul 14 14:16:43 2009
+++ packages/mutt/mutt-bj.status-time.patch	Tue Jul 14 14:31:14 2009
@@ -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));

================================================================
Index: packages/mutt/mutt-pl.po-update.patch
diff -u packages/mutt/mutt-pl.po-update.patch:1.1.2.4 packages/mutt/mutt-pl.po-update.patch:1.1.2.5
--- packages/mutt/mutt-pl.po-update.patch:1.1.2.4	Tue Jul 14 14:16:43 2009
+++ packages/mutt/mutt-pl.po-update.patch	Tue Jul 14 14:31:14 2009
@@ -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 <dzieko at gmail.com>\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 <me at mutt.org>\n"
  "Copyright (C) 1996-2002 Brandon Long <blong at fiction.net>\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 [<options>] [-z] [-f <file> | -yZ]\n"
  "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-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"

================================================================
Index: packages/mutt/mutt-rr.compressed.patch
diff -u packages/mutt/mutt-rr.compressed.patch:1.4.4.9 packages/mutt/mutt-rr.compressed.patch:1.4.4.10
--- packages/mutt/mutt-rr.compressed.patch:1.4.4.9	Tue Jul 14 14:16:43 2009
+++ packages/mutt/mutt-rr.compressed.patch	Tue Jul 14 14:31:14 2009
@@ -596,32 +596,30 @@
  	  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

================================================================
Index: packages/mutt/mutt.spec
diff -u packages/mutt/mutt.spec:1.222 packages/mutt/mutt.spec:1.222.2.1
--- packages/mutt/mutt.spec:1.222	Mon Apr 13 23:30:47 2009
+++ packages/mutt/mutt.spec	Tue Jul 14 14:31:14 2009
@@ -2,6 +2,9 @@
 #
 # TODO:
 # - finish -folder_columns.patch
+# - What to do with update mutt-pgp-hook.patch? Do we want to support it? It
+#   is no longer developed by its authors. It has not been merged by mutt
+#   upstream. It is not so easy to apply it and I do not know how to test it.
 #
 # Conditional build:
 %bcond_with	slang		# use slang library instead of ncurses
@@ -22,13 +25,13 @@
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.5.19
-Release:	2
+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,7 +49,8 @@
 # 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
+# See TODO
+# Patch10:	%{name}-pgp_hook.patch
 Patch11:	%{name}-manual.patch
 Patch12:	%{name}-xface.patch
 Patch13:	%{name}-Muttrc_mbox_path.patch
@@ -57,10 +61,9 @@
 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
+Patch20:	%{name}-imap_recent.patch
+Patch21:	%{name}-Muttrc.head.patch
+Patch22:	%{name}-smime.rc.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -153,7 +156,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+#%%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -164,10 +167,9 @@
 %patch18 -p1
 # breaks display if arrow_cursor is set
 %{?with_folder_column:%patch19 -p1}
-%patch20 -p1
-%{?with_imap_recent:%patch21 -p1}
+%{?with_imap_recent:%patch20 -p1}
+%patch21 -p1
 %patch22 -p1
-%patch23 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -272,6 +274,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.222.2.1  2009/07/14 12:31:14  pawelz
+- up to 1.5.20
+- commented out pgp_hook patch (see TODO)
+- dropped imap_mxcmp patch (no longer needed)
+- pl.po-updated needs some more work
+- updated bj.status-time and rr.compressed patches
+
 Revision 1.222  2009/04/13 21:30:47  glen
 - fixed it other ways
 - and set -e makes first false condition to exit, fix that too
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-bj.status-time.patch?r1=1.1.4.2&r2=1.1.4.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-pl.po-update.patch?r1=1.1.2.4&r2=1.1.2.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt-rr.compressed.patch?r1=1.4.4.9&r2=1.4.4.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mutt/mutt.spec?r1=1.222&r2=1.222.2.1&f=u

More information about the pld-cvs-commit mailing list