Hello community,
here is the log from the commit of package mutt
checked in at Thu Jun 29 23:00:36 CEST 2006.
--------
--- mutt/mutt.changes 2006-06-28 13:50:14.000000000 +0200
+++ mutt/mutt.changes 2006-06-29 12:53:17.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jun 29 12:52:57 CEST 2006 - werner@suse.de
+
+- Update to mutt 1.5.11
+
+-------------------------------------------------------------------
Old:
----
mutt-1.5.9i-smimesegfault.diff
mutt-1.5.9i-wrapcolumn.diff
mutt-1.5.9i.diff
mutt-1.5.9i.tar.bz2
mutt-cvs-header-cache.29
mutt-fix-imaprace.diff
patch-1.5.9.rr.compressed.1.bz2
New:
----
mutt-1.5.11-wrapcolumn.diff
mutt-1.5.11.diff
mutt-1.5.11.tar.bz2
patch-1.5.11.rr.compressed.1.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mutt.spec ++++++
--- /var/tmp/diff_new_pack.eKOnTS/_old 2006-06-29 23:00:13.000000000 +0200
+++ /var/tmp/diff_new_pack.eKOnTS/_new 2006-06-29 23:00:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package mutt (Version 1.5.9i)
+# spec file for package mutt (Version 1.5.11)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,8 +12,7 @@
Name: mutt
#!BuildIgnore: sendmail
-BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi desktop-data-SuSE glibc-i18ndata krb5-devel libidn-devel openssl-devel postfix update-desktop-files
-%define ver 1.5.9
+BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi desktop-data-SuSE docbook-xsl-stylesheets docbook_4 glibc-i18ndata krb5-devel libgcrypt libgpg-error libidn-devel libxml2 libxslt lynx openssl-devel postfix sgml-skel update-desktop-files xli
License: GPL
Group: Productivity/Networking/Email/Clients
URL: http://www.mutt.org
@@ -24,24 +23,23 @@
# desktop selections.
#Requires: desktop-data-SuSE
Autoreqprov: on
-Version: 1.5.9i
-Release: 27
+Version: 1.5.11
+Release: 1
Summary: Mail Program
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# ftp://ftp.mutt.org/mutt/devel/
Source0: %name-%version.tar.bz2
Source1: Signature_conversion
Source2: README.alternates
Patch: %name-%version.diff
-Patch1: patch-%ver.rr.compressed.1.bz2
-Patch2: %name-%version-pgpewrap.diff
-Patch3: %name-%version-sendgroupreplyto.diff
-Patch4: %name-cvs-header-cache.29
-Patch5: %name-1.5.9i-wrapcolumn.diff
-Patch6: %name-fix-imaprace.diff
-Patch7: %name-1.5.9i-smimesegfault.diff
-Patch8: patch-1.5.5.1.nt.xtitles.3.ab.1
-Patch9: patch-1.5.11.tamo.badsig_mtime.1
-Patch10: mutt-1.5.9i-imap-namespace.dif
+# http://www.spinnaker.de/mutt/compressed/
+Patch1: patch-%version.rr.compressed.1.bz2
+Patch2: %name-1.5.9i-pgpewrap.diff
+Patch3: %name-1.5.9i-sendgroupreplyto.diff
+Patch4: %name-%version-wrapcolumn.diff
+Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1
+Patch6: patch-1.5.11.tamo.badsig_mtime.1
+Patch7: mutt-1.5.9i-imap-namespace.dif
%description
A very powerful mail user agent. It supports (among other nice things)
@@ -56,17 +54,15 @@
Thomas Roessler
%prep
-%setup -q -n mutt-%ver
+%setup -q -n mutt-%version
%patch -p1
%patch1 -p1
+%patch2 -p0
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
+%patch6 -p0
%patch7 -p0
-%patch8 -p1
-%patch9 -p0
-%patch10 -p0
cp Muttrc Muttrc.SuSE
cp %{S:2} .
@@ -93,7 +89,9 @@
--enable-hcache \
--with-idn \
--disable-inodesort
+make -C doc clean
make
+make -C doc
%install
make install DESTDIR=$RPM_BUILD_ROOT
@@ -139,6 +137,8 @@
%config(noreplace) /etc/Muttrc
%changelog -n mutt
+* Thu Jun 29 2006 - werner@suse.de
+- Update to mutt 1.5.11
* Wed Jun 28 2006 - werner@suse.de
- Fix mutt IMAP buffer overflow in namespace parsing (bug #188872)
* Wed Jan 25 2006 - mls@suse.de
++++++ mutt-1.5.9i-wrapcolumn.diff -> mutt-1.5.11-wrapcolumn.diff ++++++
--- mutt/mutt-1.5.9i-wrapcolumn.diff 2005-06-28 11:28:41.000000000 +0200
+++ mutt/mutt-1.5.11-wrapcolumn.diff 2006-06-28 19:53:26.000000000 +0200
@@ -1,173 +1,53 @@
2005-05-09 12:27:44 Manfred Hollstein
- * globals.h (WrapColumn): Add new global variable.
- * init.h (MuttVars): Likewise.
- * init.c (mutt_init): Add warning message about deprecation of
- wrapmargin variable in favour of new wrapcolumn. Map uses of
- wrapmargin onto corresponding settings for wrapcolumn.
- * handler.c (text_enriched_handler): Initialize .WrapMargin field
- under consideration of the new variable WrapColumn.
- (text_plain_flowed_handler): Likewise for flowed_max.
- * pager.c (format_line): Likewise for wrap_cols.
- * Muttrc, doc/manual.sgml: Add documentation for new variable.
- * doc/manual*.html, doc/manual.txt, doc/muttrc.man: Regenerate.
+ * globals.h (WrapColumn): Add new global variable.
+ * init.h (MuttVars): Likewise.
+ * init.c (mutt_init): Add warning message about deprecation of
+ wrapmargin variable in favour of new wrapcolumn. Map uses of
+ wrapmargin onto corresponding settings for wrapcolumn.
+ * handler.c (text_enriched_handler): Initialize .WrapMargin field
+ under consideration of the new variable WrapColumn.
+ (text_plain_flowed_handler): Likewise for flowed_max.
+ * pager.c (format_line): Likewise for wrap_cols.
+ * Muttrc, doc/manual.sgml: Add documentation for new variable.
+ * doc/manual*.html, doc/manual.txt, doc/muttrc.man: Regenerate.
-================================================================================
---- mutt-1.5.9/doc/manual-6.html
-+++ mutt-1.5.9/doc/manual-6.html
-@@ -3686,6 +3686,19 @@
- unset, searches will not wrap.</P>
-
-
-+<H3><A NAME="wrapcolumn"></A> wrapcolumn</H3>
-+
-+<P>Type: number<BR>
-+Default: 0</P>
-+
-+<P>Controls at which column mutt's pager does smart wrapping. If
-+set to 0, no smart wrapping is done. If set to a negative value,
-+mutt's pager wraps at screen width - absolute value (wrapcolumn);
-+if set to a positive value, it'll wrap at that column. If the
-+absolute value of wrapcolumn is larger than what the current
-+display can handle, this value is ignored.</P>
-+
-+
- <H3><A NAME="wrapmargin"></A> wrapmargin</H3>
-
- <P>Type: number<BR>
-@@ -3693,6 +3706,7 @@
-
- <P>Controls the size of the margin remaining at the right side of
- the terminal when mutt's pager does smart wrapping.</P>
-+<P>Note, wrapmargin will be replaced by wrapcolumn in future releases.</P>
-
-
- <H3><A NAME="write_inc"></A> write_inc</H3>
---- mutt-1.5.9/doc/manual.sgml
-+++ mutt-1.5.9/doc/manual.sgml
-@@ -7092,6 +7092,20 @@
- unset, searches will not wrap.
-
-
-+<sect2>wrapcolumn<label id="wrapcolumn">
-+<p>
-+Type: number<newline>
-+Default: 0
-+
-+<p>
-+Controls at which column mutt's pager does smart wrapping. If
-+set to 0, no smart wrapping is done. If set to a negative value,
-+mutt's pager wraps at screen width - absolute value (wrapcolumn);
-+if set to a positive value, it'll wrap at that column. If the
-+absolute value of wrapcolumn is larger than what the current
-+display can handle, this value is ignored.
-+
-+
- <sect2>wrapmargin<label id="wrapmargin">
- <p>
- Type: number<newline>
-@@ -7100,6 +7114,8 @@
- <p>
- Controls the size of the margin remaining at the right side of
- the terminal when mutt's pager does smart wrapping.
-+<p>
-+Note, wrapmargin will be replaced by wrapcolumn in future releases.
-
-
- <sect2>write_inc<label id="write_inc">
---- mutt-1.5.9/doc/manual.txt
-+++ mutt-1.5.9/doc/manual.txt
-@@ -384,9 +384,10 @@
- 6.3.274 wait_key
- 6.3.275 weed
- 6.3.276 wrap_search
-- 6.3.277 wrapmargin
-- 6.3.278 write_inc
-- 6.3.279 write_bcc
-+ 6.3.277 wrapcolumn
-+ 6.3.278 wrapmargin
-+ 6.3.279 write_inc
-+ 6.3.280 write_bcc
- 6.4 Functions
- 6.4.1 generic
- 6.4.2 index
-@@ -6650,7 +6651,19 @@
- When set, searches will wrap around the first (or last) message. When
- unset, searches will not wrap.
-
-- 66..33..227777.. wwrraappmmaarrggiinn
-+ 66..33..227777.. wwrraappccoolluummnn
-+
-+ Type: number
-+ Default: 0
-+
-+ Controls at which column mutt's pager does smart wrapping. If set to
-+ 0, no smart wrapping is done. If set to a negative value, mutt's pager
-+ wraps at screen width - absolute value (wrapcolumn); if set to a
-+ positive value, it'll wrap at that column. If the absolute value of
-+ wrapcolumn is larger than what the current display can handle, this
-+ value is ignored.
-+
-+ 66..33..227788.. wwrraappmmaarrggiinn
-
- Type: number
- Default: 0
-@@ -6658,7 +6671,9 @@
- Controls the size of the margin remaining at the right side of the
- terminal when mutt's pager does smart wrapping.
-
-- 66..33..227788.. wwrriittee__iinncc
-+ Note, wrapmargin will be replaced by wrapcolumn in future releases.
-+
-+ 66..33..227799.. wwrriittee__iinncc
-
- Type: number
- Default: 10
-@@ -6669,7 +6684,7 @@
-
- Also see the ````$read_inc'''' variable.
-
-- 66..33..227799.. wwrriittee__bbcccc
-+ 66..33..228800.. wwrriittee__bbcccc
-
- Type: boolean
- Default: yes
---- mutt-1.5.9/doc/muttrc.man
-+++ mutt-1.5.9/doc/muttrc.man
-@@ -4797,6 +4797,21 @@
-
-
- .TP
-+.B wrapcolumn
-+.nf
-+Type: number
-+Default: 0
-+.fi
-+.IP
-+Controls at which column mutt's pager does smart wrapping. If
-+set to 0, no smart wrapping is done. If set to a negative value,
-+mutt's pager wraps at screen width - absolute value (wrapcolumn);
-+if set to a positive value, it'll wrap at that column. If the
-+absolute value of wrapcolumn is larger than what the current
-+display can handle, this value is ignored.
-+
-+
-+.TP
- .B wrapmargin
- .nf
- Type: number
-@@ -4805,6 +4820,8 @@
- .IP
- Controls the size of the margin remaining at the right side of
- the terminal when mutt's pager does smart wrapping.
-+.IP
-+Note, wrapmargin will be replaced by wrapcolumn in future releases.
-
-
- .TP
---- mutt-1.5.9/globals.h
-+++ mutt-1.5.9/globals.h
-@@ -172,6 +172,7 @@
+--- mutt-1.5.11/Muttrc
++++ mutt-1.5.11/Muttrc 2006-06-28 19:52:05.000000000 +0200
+@@ -4103,6 +4103,21 @@ set tilde=yes
+ # unset, searches will not wrap.
+ #
+ #
++# set wrapcolumn=0
++#
++# Name: wrapcolumn
++# Type: number
++# Default: 0
++#
++#
++# Controls at which column mutt's pager does smart wrapping. If
++# set to 0, no smart wrapping is done. If set to a negative value,
++# mutt's pager wraps at screen width - absolute value (wrapcolumn);
++# if set to a positive value, it'll wrap at that column. If the
++# absolute value of wrapcolumn is larger than what the current
++# display can handle, this value is ignored.
++#
++#
+ # set wrapmargin=0
+ #
+ # Name: wrapmargin
+@@ -4112,6 +4127,8 @@ set tilde=yes
+ #
+ # Controls the size of the margin remaining at the right side of
+ # the terminal when mutt's pager does smart wrapping.
++#
++# Note, this variable will be replaced by wrapcolumn in future releases.
+ #
+ #
+ # set write_inc=10
+--- mutt-1.5.11/globals.h
++++ mutt-1.5.11/globals.h 2006-06-28 19:52:05.000000000 +0200
+@@ -177,6 +177,7 @@ WHERE short ReadInc;
WHERE short SendmailWait;
WHERE short SleepTime INITVAL (1);
WHERE short Timeout;
@@ -175,9 +55,9 @@
WHERE short WrapMargin;
WHERE short WriteInc;
---- mutt-1.5.9/handler.c
-+++ mutt-1.5.9/handler.c
-@@ -781,7 +781,12 @@
+--- mutt-1.5.11/handler.c
++++ mutt-1.5.11/handler.c 2006-06-28 19:52:05.000000000 +0200
+@@ -780,7 +780,12 @@ int text_enriched_handler (BODY *a, STAT
memset (&stte, 0, sizeof (stte));
stte.s = s;
@@ -191,7 +71,7 @@
stte.line_max = stte.WrapMargin * 4;
stte.line = (char *) safe_calloc (1, stte.line_max + 1);
stte.param = (char *) safe_calloc (1, STRING);
-@@ -995,8 +1000,15 @@
+@@ -996,8 +1001,15 @@ static int text_plain_flowed_handler (BO
if ((flowed_max = FLOWED_MAX) > COLS - 3)
flowed_max = COLS - 3;
@@ -209,9 +89,9 @@
if (flowed_max <= 0)
flowed_max = COLS;
---- mutt-1.5.9/init.c
-+++ mutt-1.5.9/init.c
-@@ -2412,6 +2412,25 @@
+--- mutt-1.5.11/init.c
++++ mutt-1.5.11/init.c 2006-06-28 19:52:05.000000000 +0200
+@@ -2476,6 +2476,25 @@ void mutt_init (int skip_sys_rc, LIST *c
exit (1);
}
@@ -237,9 +117,9 @@
if (mutt_execute_commands (commands) != 0)
need_pause = 1;
---- mutt-1.5.9/init.h
-+++ mutt-1.5.9/init.h
-@@ -2812,11 +2812,23 @@
+--- mutt-1.5.11/init.h
++++ mutt-1.5.11/init.h 2006-06-28 19:52:05.000000000 +0200
+@@ -2876,11 +2876,23 @@ struct option_t MuttVars[] = {
** When set, searches will wrap around the first (or last) message. When
** unset, searches will not wrap.
*/
@@ -263,42 +143,9 @@
*/
{ "write_inc", DT_NUM, R_NONE, UL &WriteInc, 10 },
/*
---- mutt-1.5.9/Muttrc
-+++ mutt-1.5.9/Muttrc
-@@ -3968,6 +3968,21 @@
- # unset, searches will not wrap.
- #
- #
-+# set wrapcolumn=0
-+#
-+# Name: wrapcolumn
-+# Type: number
-+# Default: 0
-+#
-+#
-+# Controls at which column mutt's pager does smart wrapping. If
-+# set to 0, no smart wrapping is done. If set to a negative value,
-+# mutt's pager wraps at screen width - absolute value (wrapcolumn);
-+# if set to a positive value, it'll wrap at that column. If the
-+# absolute value of wrapcolumn is larger than what the current
-+# display can handle, this value is ignored.
-+#
-+#
- # set wrapmargin=0
- #
- # Name: wrapmargin
-@@ -3977,6 +3992,8 @@
- #
- # Controls the size of the margin remaining at the right side of
- # the terminal when mutt's pager does smart wrapping.
-+#
-+# Note, this variable will be replaced by wrapcolumn in future releases.
- #
- #
- # set write_inc=10
---- mutt-1.5.9/pager.c
-+++ mutt-1.5.9/pager.c
-@@ -1035,8 +1035,12 @@
+--- mutt-1.5.11/pager.c
++++ mutt-1.5.11/pager.c 2006-06-28 19:52:05.000000000 +0200
+@@ -1065,8 +1065,12 @@ static int format_line (struct line_t **
int ch, vch, k, last_special = -1, special = 0, t;
wchar_t wc;
mbstate_t mbstate;
++++++ mutt-1.5.9i-smimesegfault.diff -> mutt-1.5.11.diff ++++++
--- mutt/mutt-1.5.9i-smimesegfault.diff 2005-07-24 17:09:33.000000000 +0200
+++ mutt/mutt-1.5.11.diff 2006-06-29 12:48:27.000000000 +0200
@@ -1,85 +1,165 @@
-diff -u -r3.15 recvattach.c
---- recvattach.c 3 Feb 2005 17:01:44 -0000 3.15
-+++ recvattach.c 24 Jul 2005 14:20:54 -0000
-@@ -889,7 +889,7 @@
-
- char helpstr[SHORT_STRING];
- MUTTMENU *menu;
-- BODY *cur;
-+ BODY *cur = NULL;
- MESSAGE *msg;
- FILE *fp;
- ATTACHPTR **idx = NULL;
-Index: smime.c
-===================================================================
-RCS file: /cvs/mutt/mutt/smime.c,v
-retrieving revision 3.38
-diff -u -r3.38 smime.c
---- smime.c 28 Feb 2005 14:37:09 -0000 3.38
-+++ smime.c 24 Jul 2005 14:20:54 -0000
-@@ -1716,7 +1716,8 @@
- {
- fclose (smimeout); smimeout = NULL;
- mutt_unlink (tmpfname);
-- state_attach_puts (_("[-- Error: unable to create OpenSSL subprocess! --]\n"), s);
-+ if (s->flags & M_DISPLAY)
-+ state_attach_puts (_("[-- Error: unable to create OpenSSL subprocess! --]\n"), s);
- return NULL;
- }
- else if ((type & SIGNOPAQUE) &&
-@@ -1726,7 +1727,8 @@
- {
- fclose (smimeout); smimeout = NULL;
- mutt_unlink (tmpfname);
-- state_attach_puts (_("[-- Error: unable to create OpenSSL subprocess! --]\n"), s);
-+ if (s->flags & M_DISPLAY)
-+ state_attach_puts (_("[-- Error: unable to create OpenSSL subprocess! --]\n"), s);
- return NULL;
- }
-
-@@ -1868,6 +1870,7 @@
- size_t tmplength = b->length;
- int origType = b->type;
- FILE *tmpfp=NULL;
-+ int rv = 0;
-
- if (!mutt_is_application_smime (b))
- return -1;
-@@ -1900,21 +1903,29 @@
- if ((*fpout = safe_fopen (tempfile, "w+")) == NULL)
- {
- mutt_perror (tempfile);
-- return (-1);
-+ rv = -1;
-+ goto bail;
- }
- mutt_unlink (tempfile);
-
-- *cur = smime_handle_entity (b, &s, *fpout);
-+ if (!(*cur = smime_handle_entity (b, &s, *fpout)))
-+ {
-+ rv = -1;
-+ goto bail;
-+ }
-+
- (*cur)->goodsig = b->goodsig;
-- (*cur)->badsig = b->badsig;
-+ (*cur)->badsig = b->badsig;
-+
-+bail:
- b->type = origType;
- b->length = tmplength;
- b->offset = tmpoffset;
-- fclose (tmpfp);
--
-- rewind (*fpout);
-- return (0);
--
-+ safe_fclose (&tmpfp);
-+ if (*fpout)
-+ rewind (*fpout);
-+
-+ return rv;
- }
-
+--- mutt-1.5.11/Makefile.am
++++ mutt-1.5.11/Makefile.am 2006-06-28 18:43:02.000000000 +0200
+@@ -55,7 +55,7 @@ DEFS=-DPKGDATADIR=\"$(pkgdatadir)\" -DSY
+
+ INCLUDES=-I. -I$(top_srcdir) $(IMAP_INCLUDES) $(LIBGPGME_CFLAGS) -Iintl
+
+-CPPFLAGS=@CPPFLAGS@ -I$(includedir)
++CPPFLAGS=@CPPFLAGS@
+
+
+ EXTRA_mutt_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \
+--- mutt-1.5.11/Muttrc
++++ mutt-1.5.11/Muttrc 2006-06-28 18:57:39.000000000 +0200
+@@ -15,9 +15,9 @@ macro index \cb |urlview\n 'call urlview
+ macro pager \cb |urlview\n 'call urlview to extract URLs out of a message'
+
+ # Show documentation when pressing F1
+-macro generic <f1> "!less ${prefix}/doc/mutt/manual.txt\n" "Show Mutt documentation"
+-macro index <f1> "!less ${prefix}/doc/mutt/manual.txt\n" "Show Mutt documentation"
+-macro pager <f1> "!less ${prefix}/doc/mutt/manual.txt\n" "Show Mutt documentation"
++macro generic <f1> "!less -iM ${prefix}/share/doc/packages/mutt/manual.txt.gz\n" "Show Mutt documentation"
++macro index <f1> "!less -iM ${prefix}/share/doc/packages/mutt/manual.txt.gz\n" "Show Mutt documentation"
++macro pager <f1> "!less -iM ${prefix}/share/doc/packages/mutt/manual.txt.gz\n" "Show Mutt documentation"
+
+ # If Mutt is unable to determine your site's domain name correctly, you can
+ # set the default here.
+@@ -228,9 +228,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # in a reply. For a full listing of defined printf()-like sequences see
+ # the section on ``$index_format''.
+ #
+-#
+-# set autoedit=no
+-#
++
++set autoedit=yes
++
+ # Name: autoedit
+ # Type: boolean
+ # Default: no
+@@ -1788,9 +1788,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # directly from the pager, and screen resizes cause lines longer than
+ # the screen width to be badly formatted in the help menu.
+ #
+-#
+-# set pager_context=0
+-#
++
++set pager_context=4
++
+ # Name: pager_context
+ # Type: number
+ # Default: 0
+@@ -1814,9 +1814,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # pager. The valid sequences are listed in the ``$index_format''
+ # section.
+ #
+-#
+-# set pager_index_lines=0
+-#
++
++set pager_index_lines=10
++
+ # Name: pager_index_lines
+ # Type: number
+ # Default: 0
+@@ -1834,9 +1834,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # is less than pager_index_lines, then the index will only use as
+ # many lines as it needs.
+ #
+-#
+-# set pager_stop=no
+-#
++
++set pager_stop=yes
++
+ # Name: pager_stop
+ # Type: boolean
+ # Default: no
+@@ -3255,9 +3255,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # (possibly undeleted) message whenever a command that modifies the
+ # current message is executed.
+ #
+-#
+-# set reverse_alias=no
+-#
++
++set reverse_alias=yes
++
+ # Name: reverse_alias
+ # Type: boolean
+ # Default: no
+@@ -3582,9 +3582,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # messages from the current folder. The default is to pause one second, so
+ # a value of zero for this option suppresses the pause.
+ #
+-#
+-# set sort=date
+-#
++
++set sort=reverse-date-sent
++
+ # Name: sort
+ # Type: sort order
+ # Default: date
+@@ -3878,9 +3878,9 @@ macro pager <f1> "!less ${prefix}/doc/
+ # messages to be searched are decoded before searching. If unset,
+ # messages are searched as they appear in the folder.
+ #
+-#
+-# set tilde=no
+-#
++
++set tilde=yes
++
+ # Name: tilde
+ # Type: boolean
+ # Default: no
+--- mutt-1.5.11/configure.in
++++ mutt-1.5.11/configure.in 2006-06-28 18:43:02.000000000 +0200
+@@ -204,7 +204,7 @@ main ()
+ mutt_cv_slang=$withval
+ if test -d $withval/include/slang; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include/slang"
+- elif test -d $withval/include; then
++ elif test -d $withval/include && test $withval != /usr ; then
+ CPPFLAGS="$CPPFLAGS -I${withval}/include"
+ fi
+ LDFLAGS="$LDFLAGS -L${withval}/lib"
+@@ -558,8 +558,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-
+
+ if test "$with_ssl" != "yes"
+ then
++ case $withval in /usr|/usr/local) ;;
++ *)
+ LDFLAGS="$LDFLAGS -L$withval/lib"
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
++ ;;
++ esac
+ fi
+ saved_LIBS="$LIBS"
+
+@@ -610,8 +614,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with
+ then
+ if test "$with_sasl" != "yes"
+ then
++ case $with_sasl in /usr|/usr/local) ;;
++ *)
+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
+ LDFLAGS="$LDFLAGS -L$with_sasl/lib"
++ ;;
++ esac
+ fi
+
+ saved_LIBS="$LIBS"
+--- mutt-1.5.11/doc/Makefile.in
++++ mutt-1.5.11/doc/Makefile.in 2006-06-29 12:47:51.000000000 +0200
+@@ -108,7 +108,7 @@ uninstall:
+
+ check:
+ manual.txt: manual.html
+- -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
++ -lynx -dont_wrap_pre -center -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@
+ manual.html: $(srcdir)/html.xsl manual.xml
+ -xsltproc --nonet -o $@ $^
++++++ mutt-1.5.9i.tar.bz2 -> mutt-1.5.11.tar.bz2 ++++++
++++ 185582 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org