commit mutt for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Fri Dec 4 12:49:10 CET 2009. -------- --- mutt/mutt.changes 2009-11-25 14:04:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2009-12-02 12:53:45.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 2 12:38:04 CET 2009 - werner@suse.de + +- Do not fold From lines into wrong format (bnc#559525) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mutt-1.5.20-bnc559525.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.obmV2T/_old 2009-12-04 12:45:54.000000000 +0100 +++ /var/tmp/diff_new_pack.obmV2T/_new 2009-12-04 12:45:54.000000000 +0100 @@ -21,7 +21,7 @@ Name: mutt #!BuildIgnore: sendmail BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi docbook-xsl-stylesheets docbook_4 gdbm-devel glibc-i18ndata gpgme-devel ispell krb5-devel libcom_err libgcrypt libgpg-error-devel libidn-devel libxml2 libxslt lynx ncurses-devel openssl-devel postfix sgml-skel update-desktop-files xli -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Email/Clients Url: http://www.mutt.org Provides: muttssl @@ -32,7 +32,7 @@ #Requires: desktop-data-SuSE AutoReqProv: on Version: 1.5.20 -Release: 5 +Release: 6 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 @@ -55,6 +55,7 @@ Patch8: mutt-1.5.19-opennfs.dif Patch9: mutt-1.5.20-gpgme_set_locale.patch Patch10: mutt-1.5.20-bnc537141.dif +Patch11: mutt-1.5.20-bnc559525.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -83,6 +84,7 @@ %patch8 -p0 %patch9 -p1 %patch10 -p0 +%patch11 -p0 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++++++ mutt-1.5.20-bnc559525.dif ++++++ --- sendlib.c +++ sendlib.c 2009-12-02 11:35:43.095929251 +0000 @@ -1630,9 +1630,9 @@ static int fold_one_header (FILE *fp, co dprint(4,(debugfile,"mwoh: pfx=[%s], tag=[%s], flags=%d value=[%s]\n", pfx, tag, flags, value)); - if (fprintf (fp, "%s%s: ", NONULL (pfx), tag) < 0) + if (tag && *tag && fprintf (fp, "%s%s: ", NONULL (pfx), tag) < 0) return -1; - col = mutt_strlen (tag) + 2 + mutt_strlen (pfx); + col = mutt_strlen (tag) + (tag && *tag ? 2 : 0) + mutt_strlen (pfx); while (p && *p) { @@ -1717,9 +1717,11 @@ static int write_one_header (FILE *fp, i int flags) { char *tagbuf, *valbuf, *t; + int is_from = ((end - start) > 5 && + ascii_strncasecmp (start, "from ", 5) == 0); /* only pass through folding machinery if necessary for sending */ - if (!(flags & CH_DISPLAY) && pfxw + max <= wraplen) + if (!(flags & CH_DISPLAY) && (pfxw + max <= wraplen || is_from)) { valbuf = mutt_substrdup (start, end); dprint(4,(debugfile,"mwoh: buf[%s%s] short enough, " @@ -1728,6 +1730,8 @@ static int write_one_header (FILE *fp, i if (pfx && *pfx) if (fputs (pfx, fp) == EOF) return -1; + if (!(t = strchr (valbuf, ':'))) + return 0; if (print_val (fp, pfx, valbuf, flags) < 0) { FREE(&valbuf); @@ -1738,10 +1742,22 @@ static int write_one_header (FILE *fp, i else { t = strchr (start, ':'); - tagbuf = mutt_substrdup (start, t); - valbuf = mutt_substrdup (t + 2, end); + if (t > end) + { + return 0; + } + if (is_from) + { + tagbuf = NULL; + valbuf = mutt_substrdup (start, end); + } + else + { + tagbuf = mutt_substrdup (start, t); + valbuf = mutt_substrdup (t + 2, end); + } dprint(4,(debugfile,"mwoh: buf[%s%s] too long, " - "max width = %d > %dn", + "max width = %d > %d\n", NONULL(pfx), valbuf, max, wraplen)); if (fold_one_header (fp, tagbuf, valbuf, pfx, wraplen, flags) < 0) return -1; ++++++ patch-1.5.20.sidebar.20090619.txt.bz2 ++++++ Files mutt/patch-1.5.20.sidebar.20090619.txt.bz2 and /mounts/work_src_done/STABLE/mutt/patch-1.5.20.sidebar.20090619.txt.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de