commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-08-17 12:08:49 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.3399 (New) Package is "mutt" Mon Aug 17 12:08:49 2020 rev:95 rq:827247 version:1.14.6 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2020-06-25 15:08:37.317590052 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new.3399/mutt.changes 2020-08-17 12:10:22.498861267 +0200 @@ -1,0 +2,9 @@ +Sat Aug 15 06:32:50 UTC 2020 - Andreas Stieger + +- mutt 1.14.6: + * fix bug where atimes were not being properly reset for mailbox +entries + * Remove $ssl_starttls check for IMAP PREAUTH + * Don't check IMAP PREAUTH encryption if $tunnel is in use + +--- Old: mutt-1.14.4.tar.gz New: mutt-1.14.6.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.zkLQSv/_old 2020-08-17 12:10:24.182862206 +0200 +++ /var/tmp/diff_new_pack.zkLQSv/_new 2020-08-17 12:10:24.186862208 +0200 @@ -16,16 +16,47 @@ # +%global _sysconfdir %{_sysconfdir} %bcond_withmutt_openssl %bcond_without mutt_gnutls - Name: mutt -%if %{with mutt_openssl} -BuildRequires: pkgconfig(openssl) -%endif -%if %{with mutt_gnutls} -BuildRequires: pkgconfig(gnutls) -%endif +Version:1.14.6 +Release:0 +Summary:Mail Program +# ftp://ftp.mutt.org/mutt/devel/ +# https:///bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz +License:GPL-2.0-or-later +Group: Productivity/Networking/Email/Clients +URL:http://www.mutt.org +Source0: https://bitbucket.org/mutt/mutt/downloads/mutt-%{version}.tar.gz +Source1:Signature_conversion +Source2:README.alternates +Source3:mutt.png +Source4:mutt.desktop +Source5:skel.muttrc +Source9:mutt.mailcap +Patch0: %{name}-1.13.3.dif +# http://www.spinnaker.de/mutt/compressed/ +Patch2: %{name}-1.5.9i-pgpewrap.diff +Patch3: %{name}-1.5.20-sendgroupreplyto.diff +Patch4: %{name}-1.5.15-wrapcolumn.diff +Patch7: mutt-1.6.1-opennfs.dif +Patch9: bug-676388-largefile.patch +# http://www.wolfermann.org/mutt.html +Patch11:aw.listreply.diff +Patch12:patch-1.5.24.vk.pgp_verbose_mime +# PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler +Patch15:widechar.sidebar.dif +# PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF +Patch16:mutt-1.5.23-carriage-return.path +# PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html +Patch18:mutt-1.5.21-mailcap.diff +# PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() +Patch19:bsc907453-CVE-2014-9116-jessie.patch +# PATCH-ENHANCE-SUSE: allow to list current imap folders +Patch20:mutt-1.10.1-imap.patch +# PATCH-ENHANCE-SUSE: boo#1156477 - Mutt has an option to ask before quitting on ^C but quits immediately on ^4 +Patch21:mutt-Fix-SIGQUIT-handling.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cyrus-sasl-gssapi @@ -35,8 +66,30 @@ BuildRequires: libgpgme-devel BuildRequires: libxslt-tools BuildRequires: opensp +BuildRequires: pkgconfig +BuildRequires: w3m BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(libsasl2) +Requires(post): %{_bindir}/cat +Requires(post): %{_bindir}/mkdir +Requires(postun): %{_bindir}/rm +Requires(pre): %{_bindir}/grep +Requires(pre): %{_bindir}/zcat +Recommends: hunspell +Recommends: mutt-doc +Recommends: mutt-lang +Recommends: urlscan +Recommends: urlview +Recommends: w3m +Provides: muttssl +Obsoletes: muttssl +%if %{with mutt_openssl} +BuildRequires: pkgconfig(openssl) +%endif +%if %{with mutt_gnutls} +BuildRequires: pkgconfig(gnutls) +%endif %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(kyotocabinet) %else @@ -47,7 +100,6 @@ %else BuildRequires: pkgconfig(libidn) %endif -BuildRequires: pkgconfig(libsasl2) %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(ncurses) %else @@ -59,63 +111,10 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -BuildRequires: w3m -URL:http://www.mutt.org -Requires(postun): /usr/bin/rm -Requires(post): /usr/bin/mkdir -Requires(post): /usr/bin/cat -Requires(pre): /usr/bin/zcat -Requires(pre): /usr/bin/grep -Recommends: hunspell -Provides: muttssl -Obsoletes: muttssl -Recommends: mutt-doc -Recommends: mutt-lang -Recommends:
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-06-25 15:07:27 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.3060 (New) Package is "mutt" Thu Jun 25 15:07:27 2020 rev:94 rq:816866 version:1.14.4 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2020-05-26 17:24:21.968625664 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new.3060/mutt.changes 2020-06-25 15:08:37.317590052 +0200 @@ -1,0 +2,35 @@ +Mon Jun 22 13:57:52 UTC 2020 - Dr. Werner Fink + +- Update to 1.14.4 - bug-fix release (boo#1173197, CVE-2020-14954) + * Fix STARTTLS response injection attack. + +--- +Mon Jun 15 15:05:52 UTC 2020 - Werner Fink + +- Update to 1.14.3 - bug-fix release (boo#1172906, boo#1172935, + CVE-2020-14093, CVE-2020-14154) + * Prevent possible IMAP MITM via PREAUTH response. + * expired where certs not properly rejected with GnuTLS + * Fix GnuTLS interactive prompt short-circuiting. + * Abort GnuTLS certificate check if a cert in the chain is rejected. + * Fix GnuTLS tls_verify_peers() checking. + * Fix GNUTLS_E_NO_CERTIFICATE_FOUND check to be against verify_ret +instead of certstat. + * Fix gnutls_strerror() call to use verify_ret instead of certstat. +- Modify/refresh patches + * aw.listreply.diff + * bsc907453-CVE-2014-9116-jessie.patch + * bug-676388-largefile.patch + * mutt-1.10.1-imap.patch + * mutt-1.13.3.dif + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.21-mailcap.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.5.9i-pgpewrap.diff + * mutt-1.6.1-opennfs.dif + * mutt-Fix-SIGQUIT-handling.patch + * patch-1.5.24.vk.pgp_verbose_mime + * widechar.sidebar.dif + +--- Old: mutt-1.14.1.tar.gz New: mutt-1.14.4.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.QV6CHa/_old 2020-06-25 15:08:41.121601988 +0200 +++ /var/tmp/diff_new_pack.QV6CHa/_new 2020-06-25 15:08:41.125602001 +0200 @@ -78,7 +78,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -Version:1.14.1 +Version:1.14.4 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.QV6CHa/_old 2020-06-25 15:08:41.169602139 +0200 +++ /var/tmp/diff_new_pack.QV6CHa/_new 2020-06-25 15:08:41.169602139 +0200 @@ -8,7 +8,7 @@ --- init.h +++ init.h 2020-01-14 13:35:13.352604037 + -@@ -1745,6 +1745,13 @@ struct option_t MuttVars[] = { +@@ -1819,6 +1819,13 @@ struct option_t MuttVars[] = { ** from your spool mailbox to your $$mbox mailbox, or as a result of ** a ``$mbox-hook'' command. */ @@ -24,7 +24,7 @@ ** .pp --- mutt.h +++ mutt.h 2020-01-14 13:32:27.595685455 + -@@ -338,6 +338,7 @@ enum +@@ -337,6 +337,7 @@ enum #endif OPT_SUBJECT, OPT_VERIFYSIG, /* verify PGP signatures */ @@ -34,7 +34,7 @@ OPT_MAX --- send.c +++ send.c 2020-01-14 13:32:27.599685379 + -@@ -565,6 +565,7 @@ static int include_reply (CONTEXT *ctx, +@@ -567,6 +567,7 @@ static int include_reply (CONTEXT *ctx, static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) { char prompt[STRING]; @@ -42,7 +42,7 @@ if (flags && env->mail_followup_to && hmfupto == MUTT_YES) { -@@ -578,6 +579,23 @@ static int default_to (ADDRESS **to, ENV +@@ -580,6 +581,23 @@ static int default_to (ADDRESS **to, ENV if (flags & SENDLISTREPLY) return 0; ++ bsc907453-CVE-2014-9116-jessie.patch ++ --- /var/tmp/diff_new_pack.QV6CHa/_old 2020-06-25 15:08:41.177602165 +0200 +++ /var/tmp/diff_new_pack.QV6CHa/_new 2020-06-25 15:08:41.177602165 +0200 @@ -18,7 +18,7 @@ --- lib.c +++ lib.c 2019-01-02 13:25:44.767193676 + -@@ -662,6 +662,9 @@ char *mutt_substrdup (const char *begin, +@@ -666,6 +666,9 @@ char *mutt_substrdup (const char *begin, size_t len; char *p; ++ bug-676388-largefile.patch ++ --- /var/tmp/diff_new_pack.QV6CHa/_old 2020-06-25 15:08:41.189602202 +0200 +++ /var/tmp/diff_new_pack.QV6CHa/_new 2020-06-25 15:08:41.189602202 +0200 @@ -20,7 +20,7 @@ return -1; --- mutt.h +++ mutt.h 2020-01-14 13:31:51.368358811 + -@@ -759,7 +759,7 @@ typedef struct body +@@ -766,7 +766,7 @@ typedef struct body PARAMETER *parameter; /* parameters of the content-type */ char *description;/* content-description */ char *form_name;/* Content-Disposition form-data name param */ ++ mutt-1.10.1-imap.patch
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-05-07 14:54:28 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.2738 (New) Package is "mutt" Thu May 7 14:54:28 2020 rev:92 rq:800759 version:1.14.0 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2020-04-21 13:10:05.528743460 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new.2738/mutt.changes 2020-05-07 14:54:38.510312088 +0200 @@ -1,0 +2,64 @@ +Mon May 4 12:09:39 UTC 2020 - Paolo Stivanin + +- Update to version 1.14.0 + * $imap_check_subscribed will fetch the set of subscribed folders from +your server on connection. + * IMAP server-side simple string search using '=' instead of '~'. +('=' also provides local simple string search.) + * IMAP IDLE support and $imap_idle + * function + * S/MIME support. Please see contrib/smime.rc for suggested settings. + * GPGME support via $crypt_use_gpgme + * Ability to encrypt postponed messages. See $postpone_encrypt and +$postpone_encrypt_as. + * GnuPG fingerprints are used internally when possible. + * $crypt_opportunistic_encrypt automatically enables/disables encryption +based on message recipients. + * IDNA support. Options $idn_decode and $idn_encode control whether +mutt will decode and encode international domains using IDNA. + * SMTPUTF8 support. Support for utf-8 domains without IDNA encoding. +To use this, unset idn_encode. + * $assumed_charset, $attach_charset, $ignore_linear_white_space + * Header caching for IMAP and Maildir. See $header_cache for more details. + * Internal ESMTP relay support. See $smtp_url. + * $mail_check_recent controls whether all unread mail or only new mail +since the last mailbox visit will be reported as new + * Support for saving history across sessions. See $save_history, +$history_file. + * More search patterns: ++ thread patterns. Use ~(...) to match all threads that + contain a message that matches ... ++ ~l matches all known lists, ~u only subscribed. ++ ~$ pattern matches unreferenced messages. ++ ~V pattern matches cryptographically verified messages. + * Improved flowed text support: $reflow_text, $reflow_wrap, +$reflow_space_quotes. + * $braille_friendly option will place the cursor at the beginning of +the current line in menus. + * Full large file support. + * Terminal status-line (TS) support, a.k.a. xterm title. see the +following variables: $ts_enabled, $ts_icon_format, $ts_status_format + * Generic spam detection: new configuration commands: 'spam' and +'nospam', new options: $spam_separator, new expando: %H (for +$index_format), new pattern: ~H pattern + * New command line options: ++ -A command line option for alias expansion. ++ -D will print the value of all variables. ++ -E command line option to edit draft and include files. ++ -Q queries configuration variables + * New functions: ++ you can edit threads via and ++ lists mailboxes with new mail. ++ displays the keycode for a key press. ++ and ++ and + * $resume_draft_files and $resume_edited_draft files control how +draft files are processed. + * $narrow_tree makes the thread tree narrower. + * new and changed hooks: reply-hook, send2-hook. crypt-hook can be +specified multiple times for the same regexp. + * The $alternates option has turned into the 'alternates' command. + * mime_lookup command specifies a list of MIME types that should not +be treated according to their mailcap entry + +--- Old: mutt-1.13.5.tar.gz New: mutt-1.14.0.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.0ItAQt/_old 2020-05-07 14:54:42.570319261 +0200 +++ /var/tmp/diff_new_pack.0ItAQt/_new 2020-05-07 14:54:42.570319261 +0200 @@ -78,7 +78,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -Version:1.13.5 +Version:1.14.0 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ @@ -350,6 +350,8 @@ %doc %{_docdir}/%name/samples/mutt_xtitle %doc %{_docdir}/%name/samples/sample.* %doc %{_docdir}/%name/samples/smime_keys_test.pl +%doc %{_docdir}/%name/samples/bgedit-detectgui.sh +%doc %{_docdir}/%name/samples/bgedit-screen-tmux.sh %dir %doc %{_docdir}/%name/samples/iconv/ %doc %{_docdir}/%name/samples/iconv/*.rc %doc %{_infodir}/*.gz ++ mutt-1.13.5.tar.gz -> mutt-1.14.0.tar.gz ++ 266321 lines of diff (skipped)
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-01-30 16:20:19 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.26092 (New) Package is "mutt" Thu Jan 30 16:20:19 2020 rev:89 rq:768746 version:1.13.3 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2020-01-29 13:19:12.158195054 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new.26092/mutt.changes 2020-01-30 16:20:23.770065482 +0100 @@ -1,0 +2,5 @@ +Thu Jan 30 13:54:17 UTC 2020 - Dr. Werner Fink + +- Be aware that it might be that the version is not found (boo#1162245) + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.x6WRQ5/_old 2020-01-30 16:20:27.050064611 +0100 +++ /var/tmp/diff_new_pack.x6WRQ5/_new 2020-01-30 16:20:27.050064611 +0100 @@ -285,7 +285,7 @@ %pre if test $1 -gt 1 -a -e %{_docdir}/%name/manual.txt.gz then -zcat %{_docdir}/%name/manual.txt.gz | grep -F 'version %{version}' > /run/mutt-version +zcat %{_docdir}/%name/manual.txt.gz | grep -F 'version %{version}' > /run/mutt-version || : fi %post
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-01-29 13:18:37 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.26092 (New) Package is "mutt" Wed Jan 29 13:18:37 2020 rev:88 rq:768052 version:1.13.3 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2020-01-22 22:46:02.620568764 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new.26092/mutt.changes 2020-01-29 13:19:12.158195054 +0100 @@ -1,0 +2,12 @@ +Tue Jan 28 13:42:02 UTC 2020 - Dr. Werner Fink + +- Add version check, that is if installed mutt version does not + fit the installing version then do notify message + +--- +Tue Jan 28 10:13:24 UTC 2020 - Dr. Werner Fink + +- Add a notify message about behaviour/variable changes to inform + users about these (thanks to Roger Whittaker) + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.XkXgvW/_old 2020-01-29 13:19:13.786195886 +0100 +++ /var/tmp/diff_new_pack.XkXgvW/_new 2020-01-29 13:19:13.790195889 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2020 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,8 +61,11 @@ %endif BuildRequires: w3m URL:http://www.mutt.org -Requires(post): %install_info_prereq -Requires(preun): %install_info_prereq +Requires(postun): /usr/bin/rm +Requires(post): /usr/bin/mkdir +Requires(post): /usr/bin/cat +Requires(pre): /usr/bin/zcat +Requires(pre): /usr/bin/grep Recommends: hunspell Provides: muttssl Obsoletes: muttssl @@ -124,6 +127,8 @@ Summary:Additional Documentation about Mutt Group: Documentation/Other Requires: %{name} = %{version} +Requires(post): %install_info_prereq +Requires(preun): %install_info_prereq Recommends: perl(Expect) Provides: %{name}:%{_docdir}/%name/COPYRIGHT BuildArch: noarch @@ -272,23 +277,38 @@ install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap rm -vf %{buildroot}%{_docdir}/%name/manual.txt install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/ + %if 0%{?suse_version} %suse_update_desktop_file mutt %endif -%if 0%{?suse_version} > 1130 +%pre +if test $1 -gt 1 -a -e %{_docdir}/%name/manual.txt.gz +then +zcat %{_docdir}/%name/manual.txt.gz | grep -F 'version %{version}' > /run/mutt-version +fi + %post %mime_database_post +if test -f /run/mutt-version -a ! -s /run/mutt-version +then +mkdir -p %{_localstatedir}/adm/update-messages +cat > %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-notify <<-'EOF' + With %{name}-%{version} some variables and the behaviour changes: + $send_multipart_alternative changes to run in batch mode on ask-yes. + $write_bcc changes to default off + EOF +fi %postun %mime_database_postun +rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-notify %post doc %install_info --info-dir=%{_infodir} "%{_infodir}/mutt.info.gz" %preun doc %install_info_delete --info-dir=%{_infodir} "%{_infodir}/mutt.info.gz" -%endif %files %defattr(-,root,root)
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-01-22 22:45:47 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.26092 (New) Package is "mutt" Wed Jan 22 22:45:47 2020 rev:87 rq:766208 version:1.13.3 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2019-11-15 00:12:18.264117541 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new.26092/mutt.changes 2020-01-22 22:46:02.620568764 +0100 @@ -1,0 +2,266 @@ +Tue Jan 14 14:53:05 UTC 2020 - Dr. Werner Fink + +- Update to mutt 1.13.3 (2020-01-07): + * Fix crash when polling a closed ssl connection. + * Turn off auto-clear outside of autocrypt initialization. + * automatic post-release commit for mutt-1.13.2 + * Revert "Fixes unchecked return from link() in dotlock.c" + * automatic post-release commit for mutt-1.13.1 + * Fix segv in IMAP postponed menu caused by reopen_allow. + * Fix imap postponed mailbox use-after-free error. + * Rename sidebar mailbox shortcuts option and default off. + * Make shortpath/indent code guards explicit. + * Create $sidebar_relative_shortpath_indent, default unset. + * Fix new option order in the manual. + * Add $sidebar_use_mb_shortcuts to turn off shortcuts. + * Minor documentation fixes. + * automatic post-release commit for mutt-1.13.0 + * Change "Prf Enc" to "Prf Encr". + * Update de.po + * Update copyright year + * Update ja.po + * Clarify $write_bcc documentation. + * Add a bit more documentation about sending. + * Updated Catalan translation. + * Updated Czech translation. + * Updated Russian translation. + * Updated Ukrainian translation. + * Updated Danish translation. + * Update de.po + * Fix $fcc_attach to not prompt in batch mode. + * Change $send_multipart_alternative to run in batch mode on ask-yes. + * allow autoview preview of multipart/alternative content + * add view-alt function, so now we have ++ view-alt "v" ++ view-alt-text "Esc v" ++ view-alt-mailcap "V" + * Fix __attribute__((warn_unused_result)) issue in query.c + * Fix __attribute__((warn_unused_result)) issue in help.c + * Fix __attribute__((warn_unused_result)) warning in enter.c + * Fixes unchecked return from link() in dotlock.c + * Update patchlist.sh to support `guilt' patch queues + * Add gcc comments for fallthrough case statements. + * Add $count_alternatives to count attachments inside alternatives. + * Remove nonreentrant calls from exit_handler() + * Add markdown2html contrib script. + * Remove input buffer flush on sigwinch in index. + * Fix sigwinch race in the index and menu processor. + * Change $write_bcc to default off. + * Block multipart type alternatives generation. + * s/Mercurial/Git/ in INSTALL + * Ensure APP_PGP flag is enabled for autocrypt. + * Add ability to generate multipart/alternative using a filter script. + * Create multipart/mixed helpers. + * mutt_parse_content_type: work around annoying charset behaviour from Outlook + * Convert smime_decrypt_mime() to use buffer pool. + * Convert smime_handle_entity() to use buffers. + * Convert smime_verify_one() to use buffer pool. + * Convert smime_sign_message() to use buffer pool. + * Convert smime_build_smime_entity() to use buffer pool. + * Convert smime_invoke_import() and helpers to use buffer pool. + * Convert smime_verify_sender() and helpers to use buffer pool. + * Convert smime_get_candidates() to use buffer pool. + * Convert mutt_write_fcc() to use buffer pool. + * Convert _mutt_bounce_message to use buffer pool. + * Convert send_msg() $sendmail_wait to use buffer pool. + * Convert transform_to_7bit() to use buffer pool. + * Convert mutt_message_to_7bit() to use buffer. + * Convert fcc to a buffer. + * Convert send_message() to use buffer pool. + * Add typelen parameter to rfc1524_mailcap_lookup(). + * Convert rfc1524_mailcap_lookup() to use buffer pool for path. + * Convert mutt_attach_reply() to use buffer pool. + * Convert attach_forward_msgs() to use buffer pool. + * Convert attach_forward_bodies to use buffer pool. + * Convert attach_fmt %f to use buffer pool. + * Convert mutt_num_postponed() maildir check to use buffer pool. + * Convert pop_fetch_message() to use buffer pool. + * Convert pop_read_header() to use buffer pool. + * Convert pgp_find_hash to use buffer pool. + * Convert pgp_make_key_attachment() to use buffer pool. + * Remove make_key_attachment parameter. + * Convert pgp_select_key() to use buffer pool. + * Convert pgp_traditional_encryptsign() to use buffer pool. + * Convert pgp_encrypt_message() to use buffer pool. + * Convert pgp_encrypted_handler() to use buffer pool. + * Convert pgp_decrypt_mime() to use buf
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2019-11-15 00:12:16 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.26869 (New) Package is "mutt" Fri Nov 15 00:12:16 2019 rev:86 rq:748572 version:1.12.2 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2019-02-24 17:21:13.388388319 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new.26869/mutt.changes 2019-11-15 00:12:18.264117541 +0100 @@ -1,0 +2,61 @@ +Thu Nov 14 08:46:14 UTC 2019 - Dr. Werner Fink + +- Update to mutt 1.12.2 (2019-09-21): + + $fcc_before_send, when set, causes Fcc to occur before sending instead of +afterwards. When set, the message is saved as-sent; please see the +documentation for details. + ! $ssl_use_tlsv1 and $ssl_use_tlsv1_1 now default to unset. + + $auto_subscribe, when set, automatically adds an email with the List-Post +header to the subscribe list. + ! Fcc now occurs after sending a message. If the fcc fails, mutt will prompt +to try again, or to try another mailbox. + + Basic protected header ("memory hole") support added for the Subject header. +See the config vars: $crypt_protected_headers_read, +$crypt_protected_headers_save, $crypt_protected_headers_subject, +and $crypt_protected_headers_write. + ! Color names can be prefixed with "light" in addition to "bright". "bright" +colors are bold face, while "light" are non-bold. + ! Color commands can now include an attribute (e.g. bold, underline). + ! $pgp_use_gpg_agent defaults set. + + in the browser menu allows entering nested maildir +directories. + + replies to all, but preserves To recipients in the reply. + + $include_encrypted, default unset, prevents separately encrypted contents +from being included in a reply. This helps to prevent a decryption oracle +attack. + ! With gpgme >= 1.11, recipient keys with a trailing '!' now force subkey use, +as with classic gpg. + ! In send mode, %{charset} mailcap expansion uses the current charset of the +file. + + $imap_fetch_chunk_size allows fetching new headers in groups of this size. +This might help with timeouts during opening of huge mailboxes. +If you have huge mailboxes, you should also try $imap_qresync. + ! can be invoked from the pager too. + + The $forward_attachments quadoption allows including attachments in +inline-forwards (i.e. $mime_forward unset, $forward_decode set.) +- Add patch mutt-Fix-SIGQUIT-handling.patch for boo#1156477e + * Mutt has an option to ask before quitting on ^C but quits immediately on ^4 +- Port main patch, that is mutt-1.10.0.dif becomes now mutt-1.12.2.dif +- Refresh patches + * aw.listreply.diff + * bsc907453-CVE-2014-9116-jessie.patch + * bug-676388-largefile.patch + * mutt-1.10.1-imap.patch + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff +Note that the new function behaves the same way without +hard setting the option send_group_reply_to + * mutt-1.5.21-mailcap.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.5.9i-pgpewrap.diff + * mutt-1.6.1-opennfs.dif + * patch-1.5.24.vk.pgp_verbose_mime + * widechar.sidebar.dif + +--- +Sun Nov 10 13:34:03 UTC 2019 - Michal Suchanek + + Fix SIGQUIT handling (boo#1156477). + + mutt-Fix-SIGQUIT-handling.patch + +--- Old: mutt-1.10.0.dif mutt-1.11.3.tar.gz New: mutt-1.12.2.dif mutt-1.12.2.tar.gz mutt-Fix-SIGQUIT-handling.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.ofoabd/_old 2019-11-15 00:12:19.348117154 +0100 +++ /var/tmp/diff_new_pack.ofoabd/_new 2019-11-15 00:12:19.352117153 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -60,7 +60,7 @@ BuildRequires: update-desktop-files %endif BuildRequires: w3m -Url:http://www.mutt.org +URL:http://www.mutt.org Requires(post): %install_info_prereq Requires(preun): %install_info_prereq Recommends: hunspell @@ -75,7 +75,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -Version:1.11.3 +Version:1.12.2 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ @@ -89,7 +89,7 @@ Source4:mutt.desktop Source5:skel.muttrc Source9:mutt.mailcap -Patch: %name-1.10.0
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2019-01-08 12:27:38 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.28833 (New) Package is "mutt" Tue Jan 8 12:27:38 2019 rev:83 rq:662611 version:1.11.1 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2018-07-18 22:57:56.962163076 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new.28833/mutt.changes 2019-01-08 12:30:19.116151765 +0100 @@ -1,0 +2,50 @@ +Wed Jan 2 14:14:18 UTC 2019 - Dr. Werner Fink + +- Update to mutt 1.11.1 + * Bug fix release. + * IMAP retrieves the Sender header by default. It doesn't need to be added +to $imap_headers. + * inotify is used for local mailbox monitoring on Linux. Configuration flag +--disable-filemonitor turns this off. + * OAUTHBEARER support for IMAP, SMTP and POP via +$imap_oauth_refresh_command, $smtp_oauth_refresh_command, and +$pop_oauth_refresh_command. + * $pgp_timeout and $smime_timeout support 32-bit numbers. + * manually updates mailbox statistics, the same way +$mail_check_stats does when set. + * Thread limited views, e.g. ~(pattern), now show new mail as it arrives. + * Command line argument -z and -Z options also work for IMAP mailboxes. + * $imap_condstore and $imap_qresync enable IMAP CONDSTORE and QRESYNC +support, respectively. QRESYNC should provide much faster mailbox opening. + * $abort_noattach skips quoted lines (as defined by $quote_regexp and +$smileys). + * Initial IMAP header downloading can be aborted with ctrl-c. + * composes a message to the sender of the selected +message, in the index or attachment menu. + * Address book queries ($query_format) now support multibyte characters. + * Finnish translation. + * pgpring has been renamed to mutt_pgpring. + * Certificate prompts show sha-256 instead of md5 fingerprints. + * Non-threaded $sort_aux "reverse-" settings now work properly. + * The manual can be generated and installed in GNU Info format. + * index-format-hook and the new %@name@ expando for $index_format enable +dynamic index formats using pattern matching against the current message. +This can be used, for example, to format dates based on the age of +the message. + * Relative date matching allows hour, minute, and second units: HMS. +- Remove patch truncate.patch as it seems to be superfluous now +- Add patch mutt-1.10.1-imap.patch to enable mutt to change imap folders +- Modify the patches + * aw.listreply.diff + * bsc907453-CVE-2014-9116-jessie.patch + * bug-676388-largefile.patch + * mutt-1.10.0.dif + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.21-mailcap.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.6.1-opennfs.dif + * mutt.spec + * patch-1.5.24.vk.pgp_verbose_mime + +--- Old: mutt-1.10.1.tar.gz truncate.patch New: mutt-1.10.1-imap.patch mutt-1.11.1.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.iboTWR/_old 2019-01-08 12:30:20.104150689 +0100 +++ /var/tmp/diff_new_pack.iboTWR/_new 2019-01-08 12:30:20.108150685 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,6 +61,8 @@ %endif BuildRequires: w3m Url:http://www.mutt.org +Requires(post): %install_info_prereq +Requires(preun): %install_info_prereq Recommends: hunspell Provides: muttssl Obsoletes: muttssl @@ -73,7 +75,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -Version:1.10.1 +Version:1.11.1 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ @@ -105,8 +107,8 @@ Patch18:mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19:bsc907453-CVE-2014-9116-jessie.patch -# PATCH-FIX-SUSE: Silent gcc about truncated buffer with snprintf() -Patch20:truncate.patch +# PATCH-ENHANCE-SUSE: allow to list current imap folders +Patch20:mutt-1.10.1-imap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -152,7 +154,7 @@ %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 -%patch20 -p0 -b .trc +%patch20 -p0 -b .imap cp %{S:2} . @@ -277,6 +279,12 @@ %
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2018-07-18 22:56:53 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Wed Jul 18 22:56:53 2018 rev:82 rq:623577 version:1.10.1 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2018-07-07 22:01:45.979061655 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2018-07-18 22:57:56.962163076 +0200 @@ -1,0 +2,31 @@ +Tue Jul 17 09:46:59 UTC 2018 - wer...@suse.de + +- Update to mutt 1.10.1 (boo#1101428) + This is an important bug-fix release, fixing a code injection + and a couple path traversal vulnerabilities. + This also covers + * CVE-2018-14363 bnc#1101566 + * CVE-2018-14362 bnc#1101567 + * CVE-2018-14361 bnc#1101568 + * CVE-2018-14360 bnc#1101569 + * CVE-2018-14359 bnc#1101570 + * CVE-2018-14358 bnc#1101571 + * CVE-2018-14357 bnc#1101573 + * CVE-2018-14356 bnc#1101576 + * CVE-2018-14355 bnc#1101577 + * CVE-2018-14354 bnc#1101578 + * CVE-2018-14353 bnc#1101581 + * CVE-2018-14352 bnc#1101582 + * CVE-2018-14351 bnc#1101583 + * CVE-2018-14350 bnc#1101588 + * CVE-2018-14349 bnc#1101589 +- Modified patches + * bug-676388-largefile.patch + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.6.1-opennfs.dif + * patch-1.5.24.vk.pgp_verbose_mime + * truncate.patch + +--- Old: mutt-1.10.0.tar.gz New: mutt-1.10.1.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.0tGmHV/_old 2018-07-18 22:57:58.290158672 +0200 +++ /var/tmp/diff_new_pack.0tGmHV/_new 2018-07-18 22:57:58.294158659 +0200 @@ -73,21 +73,21 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -Version:1.10.0 +Version:1.10.1 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ -# https/bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz +# https:///bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz License:GPL-2.0-or-later Group: Productivity/Networking/Email/Clients -Source0:https/bitbucket.org/mutt/mutt/downloads/mutt-%version.tar.gz +Source0:https://bitbucket.org/mutt/mutt/downloads/mutt-%version.tar.gz Source1:Signature_conversion Source2:README.alternates Source3:mutt.png Source4:mutt.desktop Source5:skel.muttrc Source9:mutt.mailcap -Patch: %name-%version.dif +Patch: %name-1.10.0.dif # http://www.spinnaker.de/mutt/compressed/ Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff ++ bug-676388-largefile.patch ++ --- /var/tmp/diff_new_pack.0tGmHV/_old 2018-07-18 22:57:58.346158486 +0200 +++ /var/tmp/diff_new_pack.0tGmHV/_new 2018-07-18 22:57:58.350158472 +0200 @@ -20,7 +20,7 @@ return -1; --- mutt.h +++ mutt.h 2018-07-04 12:54:40.604418656 + -@@ -689,7 +689,7 @@ typedef struct body +@@ -690,7 +690,7 @@ typedef struct body PARAMETER *parameter; /* parameters of the content-type */ char *description;/* content-description */ char *form_name;/* Content-Disposition form-data name param */ ++ mutt-1.10.0.tar.gz -> mutt-1.10.1.tar.gz ++ 15221 lines of diff (skipped) ++ mutt-1.5.15-wrapcolumn.diff ++ --- /var/tmp/diff_new_pack.0tGmHV/_old 2018-07-18 22:57:58.874156735 +0200 +++ /var/tmp/diff_new_pack.0tGmHV/_new 2018-07-18 22:57:58.874156735 +0200 @@ -6,7 +6,7 @@ --- init.h +++ init.h 2018-07-04 12:19:10.323191976 + -@@ -3954,6 +3954,7 @@ struct option_t MuttVars[] = { +@@ -3968,6 +3968,7 @@ struct option_t MuttVars[] = { ** printing, or replying to messages. */ { "wrap", DT_NUM, R_PAGER, UL &Wrap, 0 }, ++ mutt-1.5.20-sendgroupreplyto.diff ++ --- /var/tmp/diff_new_pack.0tGmHV/_old 2018-07-18 22:57:58.882156708 +0200 +++ /var/tmp/diff_new_pack.0tGmHV/_new 2018-07-18 22:57:58.882156708 +0200 @@ -6,7 +6,7 @@ --- init.h +++ init.h 2018-07-04 12:14:37.508148148 + -@@ -2792,6 +2792,13 @@ struct option_t MuttVars[] = { +@@ -2809,6 +2792,13 @@ struct option_t MuttVars[] = { ** .pp ** Also see the $$force_name variable. */ ++ mutt-1.5.23-carriage-return.path ++ --- /var/tmp/diff_new_pack.0tGmHV/_old 2018-07-18 22:57:58.894156669 +0200 +++ /var/tmp/diff_new_pack.0tGmHV/_new 2018-07-18 22:57:58.894156669 +0200 @@ -7,8 +7,8 @@ 5 files changed, 26 insertions(+), 14 deletions(-) --- crypt-gpgme.c -+++ crypt-gpgme.c 2018-07
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2018-07-07 22:01:42 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Sat Jul 7 22:01:42 2018 rev:81 rq:621178 version:1.10.0 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2017-10-25 17:47:41.342942836 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2018-07-07 22:01:45.979061655 +0200 @@ -1,0 +2,23 @@ +Thu Jul 5 11:41:44 UTC 2018 - wer...@suse.de + +- Skip neomutt now (boo#1094717) + * There exists a package neomutt + * mutt-1.10.0 uses a lot of extensions now like compessed folders +and header caching, but still misses things like notmuch +- Modified patches + * aw.listreply.diff + * bsc907453-CVE-2014-9116-jessie.patch + * bug-676388-largefile.patch + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.21-mailcap.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.5.9i-pgpewrap.diff + * mutt-1.6.1-opennfs.dif + * patch-1.5.24.vk.pgp_verbose_mime + * widechar.sidebar.dif +- Renamed patch: mutt-1.9.1.dif becomes mutt-1.10.0.dif +- Deleted patches mutt-1.9.0-1.9.1.patch neomutt-c030a8b.patch +- Add patch truncate.patch to avoid truncated buffers due snprintf + +--- Old: mutt-1.9.0-1.9.1.patch mutt-1.9.1.dif neomutt-20170912.tar.gz neomutt-c030a8b.patch New: mutt-1.10.0.dif mutt-1.10.0.tar.gz truncate.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.RXIzAc/_old 2018-07-07 22:01:47.159060163 +0200 +++ /var/tmp/diff_new_pack.RXIzAc/_new 2018-07-07 22:01:47.163060157 +0200 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%bcond_without mutt_openssl -%bcond_withmutt_gnutls +%bcond_withmutt_openssl +%bcond_without mutt_gnutls Name: mutt %if %{with mutt_openssl} @@ -28,30 +28,39 @@ %endif BuildRequires: autoconf BuildRequires: automake -BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi BuildRequires: docbook-xsl-stylesheets -BuildRequires: gdbm-devel BuildRequires: hunspell -BuildRequires: krb5-devel +BuildRequires: iso_ent BuildRequires: libgpgme-devel -BuildRequires: libidn-devel -BuildRequires: libkyotocabinet-devel BuildRequires: libxslt-tools -BuildRequires: lua-devel +BuildRequires: opensp +BuildRequires: pkgconfig(gssrpc) +BuildRequires: pkgconfig(krb5) +%if 0%{?suse_version} > 1315 +BuildRequires: pkgconfig(kyotocabinet) +%else +BuildRequires: libkyotocabinet-devel +%endif +%if 0%{?suse_version} > 1315 +BuildRequires: pkgconfig(libidn2) +%else +BuildRequires: pkgconfig(libidn) +%endif +BuildRequires: pkgconfig(libsasl2) +%if 0%{?suse_version} > 1315 +BuildRequires: pkgconfig(ncurses) +%else BuildRequires: ncurses-devel -%if 0%{?is_opensuse} -BuildRequires: notmuch-devel %endif -BuildRequires: opensp %if 0%{?suse_version} > 1130 -BuildRequires: shared-mime-info +BuildRequires: pkgconfig(shared-mime-info) %endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif BuildRequires: w3m -Url:http://www.neomutt.org +Url:http://www.mutt.org Recommends: hunspell Provides: muttssl Obsoletes: muttssl @@ -64,17 +73,14 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -%globalneo 20170912 -Version:1.9.1 +Version:1.10.0 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ -# https://bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz -# Switch over to neomutt tar ball which is based on original mutt -# http://www.neomutt.org/ -License:GPL-2.0+ +# https/bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz +License:GPL-2.0-or-later Group: Productivity/Networking/Email/Clients -Source0: https://github.com/neomutt/neomutt/archive/neomutt-%{neo}.tar.gz +Source0:https/bitbucket.org/mutt/mutt/downloads/mutt-%version.tar.gz Source1:Signature_conversion Source2:README.alternates Source3:mutt.png @@ -99,10 +105,8 @@ Patch18:mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19:bsc907453-CVE-2014-9116-jessie.patch -# PATCH-F
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2017-10-25 17:47:38 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Wed Oct 25 17:47:38 2017 rev:80 rq:536409 version:1.9.1 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2017-10-05 12:03:57.640911310 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2017-10-25 17:47:41.342942836 +0200 @@ -1,0 +2,7 @@ +Tue Oct 24 14:33:00 UTC 2017 - wer...@suse.de + +- Add patch mutt-1.9.0-1.9.1.patch which is a backport of the + mutt upstream patch diff-1.9.0-1.9.1 to neomutt 20170912 +- Rename patch mutt-1.9.0.dif which now becomes mutt-1.9.1.dif + +--- Old: mutt-1.9.0.dif New: mutt-1.9.0-1.9.1.patch mutt-1.9.1.dif Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.vVAHCF/_old 2017-10-25 17:47:42.358895153 +0200 +++ /var/tmp/diff_new_pack.vVAHCF/_new 2017-10-25 17:47:42.362894965 +0200 @@ -65,7 +65,7 @@ Requires(postun): shared-mime-info %endif %globalneo 20170912 -Version:1.9.0 +Version:1.9.1 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ @@ -101,6 +101,8 @@ Patch19:bsc907453-CVE-2014-9116-jessie.patch # PATCH-FIX-UPSTREAM: bsc#1061343 - (neo)mutt displaying times in Zulu time Patch20:neomutt-c030a8b.patch +# PATCH-UPSTREAM-MUTT: Port diff-1.9.0-1.9.1 to neomutt tree +Patch42:mutt-1.9.0-1.9.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -148,6 +150,7 @@ %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 %patch20 -p1 -b .zulu +%patch42 -p0 -b .191 rm -vf README*.orig rm -vf PATCHES*.orig ++ mutt-1.9.0-1.9.1.patch ++ --- imap/command.c | 47 +++--- imap/imap.c | 79 +++- imap/imap_private.h |2 - imap/message.c |6 +-- 4 files changed, 99 insertions(+), 35 deletions(-) --- imap/command.c +++ imap/command.c 2017-10-24 14:15:49.011057645 + @@ -146,6 +146,7 @@ static void cmd_handle_fatal(struct Imap if ((idata->state >= IMAP_SELECTED) && (idata->reopen & IMAP_REOPEN_ALLOW)) { mx_fastclose_mailbox(idata->ctx); +mutt_socket_close(idata->conn); mutt_error(_("Mailbox closed")); mutt_sleep(1); idata->state = IMAP_DISCONNECTED; @@ -257,7 +258,7 @@ static void cmd_parse_expunge(struct Ima */ static void cmd_parse_fetch(struct ImapData *idata, char *s) { - unsigned int msn; + unsigned int msn, uid; struct Header *h = NULL; mutt_debug(3, "Handling FETCH\n"); @@ -288,19 +289,41 @@ static void cmd_parse_fetch(struct ImapD } s++; - if (mutt_strncasecmp("FLAGS", s, 5) != 0) + while (*s) { -mutt_debug(2, "Only handle FLAGS updates\n"); -return; - } +SKIPWS (s); - /* If server flags could conflict with mutt's flags, reopen the mailbox. */ - if (h->changed) -idata->reopen |= IMAP_EXPUNGE_PENDING; - else - { -imap_set_flags(idata, h, s); -idata->check_status = IMAP_FLAGS_PENDING; +if (mutt_strncasecmp ("FLAGS", s, 5) == 0) +{ + /* If server flags could conflict with mutt's flags, reopen the mailbox. */ + if (h->changed) +idata->reopen |= IMAP_EXPUNGE_PENDING; + else + { +imap_set_flags (idata, h, s); +idata->check_status = IMAP_FLAGS_PENDING; + } + return; +} +else if (mutt_strncasecmp ("UID", s, 3) == 0) +{ + s += 3; + SKIPWS (s); + uid = (unsigned int) atoi (s); + if (uid != HEADER_DATA(h)->uid) + { +mutt_debug(2, "FETCH UID vs MSN mismatch. Skipping update.\n"); +return; + } + s = imap_next_word (s); +} +else if (*s == ')') + s++; /* end of request */ +else if (*s) +{ + mutt_debug(2, "Only handle FLAGS updates\n"); + return; +} } } --- imap/imap.c +++ imap/imap.c 2017-10-24 14:27:08.002351735 + @@ -318,7 +318,26 @@ void imap_expunge_mailbox(struct ImapDat imap_free_header_data((struct ImapHeaderData **) &h->data); } else +{ h->index = i; + /* Mutt has several places where it turns off h->active as a + * hack. For example to avoid FLAG updates, or to exclude from + * imap_exec_msgset. + * + * Unfortunately, when a reopen is allowed and the IMAP_EXPUNGE_PENDING + * flag becomes set (e.g. a flag update to a modified header), + * this function will be called by imap_cmd_finish(). +
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2017-10-05 12:00:09 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Thu Oct 5 12:00:09 2017 rev:79 rq:531064 version:1.9.0 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2017-09-18 19:54:40.957281829 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2017-10-05 12:03:57.640911310 +0200 @@ -1,0 +2,6 @@ +Wed Oct 4 07:55:59 UTC 2017 - wer...@suse.de + +- Add patch neomutt-c030a8b.patch from upstream commit to fix + boo#1061343 + +--- New: neomutt-c030a8b.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.UqgaXb/_old 2017-10-05 12:03:59.912591716 +0200 +++ /var/tmp/diff_new_pack.UqgaXb/_new 2017-10-05 12:03:59.912591716 +0200 @@ -99,6 +99,8 @@ Patch18:mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19:bsc907453-CVE-2014-9116-jessie.patch +# PATCH-FIX-UPSTREAM: bsc#1061343 - (neo)mutt displaying times in Zulu time +Patch20:neomutt-c030a8b.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -145,6 +147,7 @@ %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 +%patch20 -p1 -b .zulu rm -vf README*.orig rm -vf PATCHES*.orig ++ neomutt-c030a8b.patch ++ >From c030a8b8ef43f2bc549e4f00651c25681d54f26e Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Thu, 14 Sep 2017 17:36:19 +0100 Subject: [PATCH] fix: %{fmt} date format A mistake was introduced when moving the date code to the library. The dates being displayed were those of the base timezone, not the email. Remove the `%<...>` documentation from `$index_format` Fixes #757 --- init.h | 2 -- lib/date.c | 12 lib/date.h | 2 +- parse.c| 10 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/init.h b/init.h index 247b0f211..4f029f39c 100644 --- a/init.h +++ b/init.h @@ -1584,8 +1584,6 @@ struct Option MuttVars[] = { ** .dt %(fmt) .dd the local date and time when the message was received. **``fmt'' is expanded by the library function \fCstrftime(3)\fP; **a leading bang disables locales - ** .dt % .dd the current local time. ``fmt'' is expanded by the library - **function \fCstrftime(3)\fP; a leading bang disables locales. ** .dt %>X.dd right justify the rest of the string and pad with character ``X'' ** .dt %|X.dd pad to the end of the line with character ``X'' ** .dt %*X.dd soft-fill with character ``X'' as pad diff --git a/lib/date.c b/lib/date.c index b1a450a24..5cce4b3f9 100644 --- a/lib/date.c +++ b/lib/date.c @@ -432,7 +432,7 @@ bool is_day_name(const char *s) * * The 'timezone' field is optional; it defaults to + if missing. */ -time_t mutt_parse_date(const char *s, const struct Tz **tz_out) +time_t mutt_parse_date(const char *s, struct Tz *tz_out) { int count = 0; char *t = NULL; @@ -537,9 +537,6 @@ time_t mutt_parse_date(const char *s, const struct Tz **tz_out) zhours = tz->zhours; zminutes = tz->zminutes; zoccident = tz->zoccident; - -if (tz_out) - *tz_out = tz; } /* ad hoc support for the European MET (now officially CET) TZ */ @@ -568,5 +565,12 @@ time_t mutt_parse_date(const char *s, const struct Tz **tz_out) return -1; } + if (tz_out) + { +tz_out->zhours = zhours; +tz_out->zminutes = zminutes; +tz_out->zoccident = zoccident; + } + return (mutt_mktime(&tm, 0) + tz_offset); } diff --git a/lib/date.h b/lib/date.h index ad0eb9c38..fab7a1b8f 100644 --- a/lib/date.h +++ b/lib/date.h @@ -45,7 +45,7 @@ time_t mutt_local_tz(time_t t); time_t mutt_mktime(struct tm *t, int local); void mutt_normalize_time(struct tm *tm); char *mutt_make_date(char *buf, size_t buflen); -time_t mutt_parse_date(const char *s, const struct Tz **tz_out); +time_t mutt_parse_date(const char *s, struct Tz *tz_out); bool is_day_name(const char *s); int mutt_check_month(const char *s); diff --git a/parse.c b/parse.c index 38f46129d..3b8966e1a 100644 --- a/parse.c +++ b/parse.c @@ -835,13 +835,13 @@ int mutt_parse_rfc822_line(struct Envelope *e, struct Header *hdr, char *line, mutt_str_replace(&e->date, p); if (hdr) { - const struct Tz *tz = NULL; + struct Tz tz; hdr->date_sent = mutt_parse_date(p, &tz); -
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2017-09-18 19:54:37 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Mon Sep 18 19:54:37 2017 rev:78 rq:526350 version:1.9.0 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2017-08-08 11:58:36.697330508 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2017-09-18 19:54:40.957281829 +0200 @@ -1,0 +2,62 @@ +Fri Sep 15 09:07:55 UTC 2017 - wer...@suse.de + +- Update to neomutt 20170912 which updates to mutt 1.9.0 + NeoMutt +Add guix build support +Only match real mailboxes when looking for new mail +Fix the printing of ncurses version in -v output +Bind editor to delete-char +Fix overflowing colours +Fix empty In-Reply-To generation +Trim trailing slash from completed dirs +Add guix-neomutt.scm +Fix setting custom query_type in notmuch query +Better curses identification +Use the system's wchar_t support +Use the system's md5 tool (or equivalent) +Clean up configure.ac +Teach gen-map-doc about the new opcode header +Rename functions (snake_case) +Rename constants/defines (UPPER_CASE) +Create library of shared functions +Much tidying +Rename globals to match user config +Drop unnecessary functions/macros +Use a standard list implementation +Coverity fixes +Use explicit NUL for string terminators +Drop OPS* in favour of opcodes.h + Upstream +Fix menu color calls to occur before positioning the cursor +When guessing an attachment type, don't allow text/plain if there is a null character +Add $imap_poll_timeout to allow mailbox polling to time out +Handle error if REGCOMP in pager fails when resizing +Change recvattach to allow nested encryption +Fix attachment check_traditional and extract_keys operations +Add edit-content-type helper and warning for decrypted attachments +Add option to run command to query attachment mime type +Add warning about using inline pgp with format=flowed +- Rename patch mutt-1.8.3.dif which becomes now mutt-1.9.0.dif +- Modify the patches + * aw.listreply.diff + * bsc907453-CVE-2014-9116-jessie.patch + * bug-676388-largefile.patch + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.21-mailcap.diff + * mutt-1.5.23-carriage-return.path + * mutt-1.5.9i-pgpewrap.diff + * mutt-1.6.1-opennfs.dif + * patch-1.5.24.vk.pgp_verbose_mime + * widechar.sidebar.dif + +--- +Thu Aug 10 08:03:38 UTC 2017 - tchva...@suse.com + +- Switch to hunspell as default spell-checking software wrt + fate#323578 +- Write SUSE in the skel.muttrc instead of SuSE +- Use the right folder for unpacking instead of symlink + * fixes quilt setup + +--- Old: mutt-1.8.3.dif neomutt-20170609.tar.gz New: mutt-1.9.0.dif neomutt-20170912.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.LP8Uci/_old 2017-09-18 19:54:42.601050630 +0200 +++ /var/tmp/diff_new_pack.LP8Uci/_new 2017-09-18 19:54:42.601050630 +0200 @@ -30,25 +30,29 @@ BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi +BuildRequires: docbook-xsl-stylesheets BuildRequires: gdbm-devel +BuildRequires: hunspell BuildRequires: krb5-devel +BuildRequires: libgpgme-devel BuildRequires: libidn-devel BuildRequires: libkyotocabinet-devel +BuildRequires: libxslt-tools BuildRequires: lua-devel BuildRequires: ncurses-devel %if 0%{?is_opensuse} BuildRequires: notmuch-devel %endif -BuildRequires: docbook-xsl-stylesheets -BuildRequires: libxslt-tools BuildRequires: opensp +%if 0%{?suse_version} > 1130 +BuildRequires: shared-mime-info +%endif %if 0%{?suse_version} BuildRequires: update-desktop-files %endif BuildRequires: w3m -#if -BuildRequires: libgpgme-devel -Url:http://www.mutt.org +Url:http://www.neomutt.org +Recommends: hunspell Provides: muttssl Obsoletes: muttssl Recommends: mutt-doc @@ -60,18 +64,17 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -%globalneo 20170609 -Version:1.8.3 +%globalneo 20170912 +Version:1.9.0 Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ -# Source0: https://bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz +# https://bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz # Switch over to neomutt tar ball whi
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2017-08-08 11:58:31 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Tue Aug 8 11:58:31 2017 rev:77 rq:510046 version:1.8.3 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2017-05-31 12:17:09.910227228 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2017-08-08 11:58:36.697330508 +0200 @@ -1,0 +2,164 @@ +Thu Jul 13 10:38:57 UTC 2017 - o...@aepfle.de + +- If built with gnutls, set ssl_ca_certificates_file to avoid + warning about "server cert signed using an insecure algorithm" + +--- +Wed Jul 12 09:26:50 UTC 2017 - o...@aepfle.de + +- Add buildconditional for openssl/gnutls + Disable gnutls, there can be only one of them and openssl was used +- Use pkgconfig to refer to openssl/gnutls +- Remove uneeded builddeps and recommends for smtp_daemon by + specifying the path to sendmail +- Remove uneeded builddep for ispell by specifying the path to it +- Update doc builddeps: add opensp, libxslt-tools, w3m + drop docbook_4,libxml2,libxslt,lynx,sgml-skel,xli +- Remove unneeded builddeps: fdupes,glibc-i18ndata,libassuan, + libcom_err,libgcrypt,libgpg-error +- Wrap desktop files handing in suse_version +- Remove included krb5-config, the copy in the devel pkg is good enough +- Use configure macro for ordinary autoconf result +- Build manual.txt with w3m to properly dump tables +- Move Requires perl-Expect to doc pkg, make it a Recommends +- Consistent suse_version for shared-mime-info usage +- Unconditional libgpgme usage +- Unconditional autoreconf + +--- +Tue Jun 13 08:21:30 UTC 2017 - wer...@suse.de + +- Update to neomutt 20170609 which updates to mutt 1.8.3 + + Warn on bindkey aliasing + + Drop PATCHES, tidy 'mutt -v' output + + Add %z format strings to index_format + + Add debug_level/debug_file options + + Fix nntp group selection + + Fix status color + + Tidy up S/MIME contrib + + Do not try to create Maildir if it is an NNTP URI + + Fix missing NONULL for mutt.set() in Lua + + Fix German PGP shortkeys + + Remove feature muttrc files + + Merge README.notmuch into manual + + Remove unneded scripts + + Remove README.SECURITY + + Remove BEWARE and devel-notes.txt + + Update Makefiles + + Delete TODO files + + Remove legacy files + + Don't generate vim-neomutt syntax file + + Remove LaTeX/pdf manual generation + + Add missing docs for expandos + + Fix sidebar howto examples + + Remove some upstream references + + Drop refs to patches + + Improve PR template and CONTRIBUTING.md + + Fix list items in newbie-tutorial's Mailing List Guidelines + + Remove configure options that no longer exist + + fix newbie tutorial + + document signing tags / releases + + config: drop unused paginate command + + script: split tests up into several + + convert credits page to markdown + + simpify 404 page + + improve newbie tutorial + + remove help.html and integrate its content elsewhere + + make: "graphviz" program is needed for generating diagram + + improve getting started guide // include legacy files + + dev: add list of architectures/operating systems + + numerous small fixes + + Remove typedefs and rename ~130 structs + + Add separate hcache dir + + Move crypto files to ncrypt dir + + Split up mutt.h, protos.h + + Always build: sidebar, imap, pop, smtp, compressed, nntp + + Remove --enable-mailtool configure option + + Make dotlock optional + + Change gpgme requirement back to 1.1.0 + + Remove check_sec.sh + + Fix safe_calloc args + + Remove unused macros + + Remove unused option: SmimeSignOpaqueCommand + + Move configure-generated files + + Update distcheck build flags + + Drop obsolete iconv check + + Unused prototypes - unsupported systems + + Drop many configure tests for things defined in POSIX:2001 + + Kill useless crypthash.h file + + Run clang-format on the code + + Fail early if ncursesw cannot be found + + Add names prototype arguments + + Abbreviate pointer tests against NULL + + Initialise pointers to NULL + + Reduce the scope of for loop variables + + Coverity: fix defects + + Convert all exec calls to use mutt_envlist(), remove setenv function + + Note that mbox-hooks are dependent on $move + + Refresh header color when updating label + + Remove glibc-specific execvpe() call in sendlib.c + + Add color commands for the compose menu headers and security status + + Fix sidebar count updates when closing mailbox + + Don't modify LastFolder/CurrentFolder upon aborting a change folder operation + + Change message modifying operations to additively set redraw f
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2017-05-31 12:15:43 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Wed May 31 12:15:43 2017 rev:76 rq:494270 version:1.8.2 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2017-03-13 15:35:03.176968492 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2017-05-31 12:17:09.910227228 +0200 @@ -1,0 +2,138 @@ +Wed May 10 08:55:37 UTC 2017 - wer...@suse.de + +- Add patch mutt-1.8.2-from4crypt.diff + to fix crash in crypt.c if no From is found or set + +--- +Mon May 1 16:06:58 UTC 2017 - wer...@suse.de + +- Switch form TokyoCabinet over to KyotoCabinet + +--- +Sun Apr 30 23:32:51 UTC 2017 - thorsten.behr...@cib.de + +- Remove warning + +--- +Sun Apr 30 23:26:06 UTC 2017 - thorsten.behr...@cib.de + +- Make header cache work again, using TokyoCabinet as backend +- Remove now-obsolete configure parameters + +--- +Sun Apr 30 05:03:43 UTC 2017 - bwiedem...@suse.com + +- call gzip -n to make build more reproducible + +--- +Sat Apr 29 16:14:43 UTC 2017 - wer...@suse.de + +- Yet an other package split: now there is a mutt-lang + +--- +Sat Apr 29 15:50:04 UTC 2017 - wer...@suse.de + +- Provide a hint on the package split + +--- +Fri Apr 28 16:27:15 UTC 2017 - wer...@suse.de + +- Move some extend documentation about mutt in a seperate package +- Remove mutt-1.5.21.de.po as mutt now have a de.po as well + +--- +Fri Apr 28 14:37:01 UTC 2017 - wer...@suse.de + +- Update to neomutt 20170421 which updates to mutt 1.8.2 + 1.8.2 Bug fix release. + 1.8.1 Bug fix release. + 1.8.0 + - $locale has been removed. Mutt now respects the LC_TIME setting +instead. See also $attribution_locale. + + $attribution_locale can be used to override the date formatting in +attribution strings. When unset, Mutt will use the locale +environment, but note the default value of $date_format has a +leading '!' which says to use the C-locale. + ! Message-id and mail-followup-to headers are now preserved for recalled +messages. + + added to complement . + ! The pager position is reset to the top when toggling header-weed. + ! IMAP messages moved to $trash via server-side copy are marked as read. + + jumps to the root message of a thread. + ! Piped text attachments are charset converted. + + Added %F to $attach_format, to show the content-disposition filename. +%d will fall back to %F which will fall back to %f. + + allows an attachment name to be changed, without +modifying the underlying file's name. + ! Mutt will look for the user's muttrc additionally in +$XDG_CONFIG_HOME/mutt/. + + Compressed mbox and mmdf files are now supported via open-hook, +close-hook, and append-hook. See contrib/sample.muttrc-compress +for suggested settings. Note this is a compile-time option: +--enable-compressed. + + When $flag_safe is set, flagged messages cannot be deleted. + + The '@' pattern modifier can be used to limit matches to known aliases. + + creates a hotkey binding to a specific message. The hotkey +prefix is specified via $mark_macro_prefix. + + and can be used to add/remove environment variables +passed to children. + ! Mutt will now use the built-in OpenSSL SSL_set_verify() callback +to verify certificates. This allows better support for verifying +chains, including alternative chain support. + + $uncollapse_new controls whether a thread will be uncollapsed when a new +message arrives. + ! $to_chars and $status_chars now accept multibyte characters. + + allows replacing matching subjects with something else. +This can be used to declutter subject lines in the index. + + can be used to add, change, or delete a message's X-Label. + ! Pattern expressions with ~y support label tab completion. + + The header cache now also supports Kyoto Cabinet and LMDB as +backend databases. + 1.7.2 (2016-12-04): + ! Bug fix release. No features were modified or added. + ! Fixes for OpenSSL 1.1. Versions less than 0.9.6 are no longer supported. + 1.7.1 (2016-10-08): + ! Bug fix release. No features were modified or added. + 1.7.0 (2016-08-18): + ! Improved alignment when using multi-column chara
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2017-03-13 15:33:33 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Mon Mar 13 15:33:33 2017 rev:75 rq:478928 version:1.6.2 Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-11-28 15:04:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2017-03-13 15:35:03.176968492 +0100 @@ -1,0 +2,10 @@ +Mon Mar 6 10:37:24 UTC 2017 - wer...@suse.de + +- Explicite add package documentation directory to file list + +--- +Thu Mar 2 11:42:45 UTC 2017 - wer...@suse.de + +- Also now recommend urlscan + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.eaV1Cm/_old 2017-03-13 15:35:04.488783106 +0100 +++ /var/tmp/diff_new_pack.eaV1Cm/_new 2017-03-13 15:35:04.492782541 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,6 +61,7 @@ Provides: muttssl Obsoletes: muttssl Recommends: smtp_daemon +Recommends: urlscan Recommends: urlview Recommends: w3m %if 0%{?suse_version} > 1130 @@ -263,7 +264,8 @@ mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc -install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap +install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap +rm -vf %{buildroot}%{_docdir}/%name/manual.txt %suse_update_desktop_file mutt %if 0%{?suse_version} >= 1140 @@ -277,9 +279,10 @@ %files -f %name.lang %defattr(-,root,root) -%doc doc/manual*.html doc/manual.txt.gz COPYRIGHT README* NEWS TODO +%doc doc/manual.txt.gz COPYRIGHT README* NEWS TODO %doc doc/PGP-Notes.txt doc/applying-patches.txt doc/devel-notes.txt %config(noreplace) %{_sysconfdir}/skel/.muttrc +%config(noreplace) %{_sysconfdir}/Muttrc %{_bindir}/mutt %{_bindir}/pgpewrap %{_bindir}/pgpring @@ -293,8 +296,21 @@ %{_mandir}/man5/mmdf_mutt.5.gz %{_mandir}/man5/muttrc.5.gz %{_mandir}/man5/mbox_mutt.5.gz -%{_datadir}/mutt +%dir %{_datadir}/mutt/ %{_datadir}/mutt/mailcap -%config(noreplace) %{_sysconfdir}/Muttrc +%doc %{_docdir}/%name/ChangeLog +%doc %{_docdir}/%name/GPL +%doc %{_docdir}/%name/*.html +%doc %{_docdir}/%name/patch-notes.txt +%dir %doc %{_docdir}/%name/samples/ +%doc %{_docdir}/%name/samples/*.rc +%doc %{_docdir}/%name/samples/ca-bundle.crt +%doc %{_docdir}/%name/samples/colors.* +%dir %doc %{_docdir}/%name/samples/iconv/ +%doc %{_docdir}/%name/samples/iconv/*.rc +%doc %{_docdir}/%name/samples/mutt_xtitle +%doc %{_docdir}/%name/samples/sample.* +%doc %{_docdir}/%name/samples/smime_keys_test.pl +%doc %{_docdir}/%name/smime-notes.txt %changelog
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-11-28 15:04:58 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-09-21 18:50:05.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-11-28 15:04:58.0 +0100 @@ -1,0 +2,15 @@ +Wed Nov 23 10:39:04 UTC 2016 - wer...@suse.de + +- Add patch mutt-1.6.2-gpgme_set_sender.patch + that is avoid name space clash with gpgme_set_sender() from gpgme + +--- +Wed Nov 23 10:13:49 UTC 2016 - wer...@suse.de + +- Rename patch mutt-1.5.23-cariage-return.path to + mutt-1.5.23-carriage-return.path +- Extend patch mutt-1.5.23-carriage-return.path + Be sure that also signed messages from Android can be verified + by gpgme interface of mutt + +--- Old: mutt-1.5.23-cariage-return.path New: mutt-1.5.23-carriage-return.path mutt-1.6.2-gpgme_set_sender.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.1qQSuf/_old 2016-11-28 15:05:00.0 +0100 +++ /var/tmp/diff_new_pack.1qQSuf/_new 2016-11-28 15:05:00.0 +0100 @@ -102,13 +102,15 @@ # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler Patch15:widechar.sidebar.dif # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF -Patch16:mutt-1.5.23-cariage-return.path +Patch16:mutt-1.5.23-carriage-return.path # PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html Patch18:mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19:bsc907453-CVE-2014-9116-jessie.patch # PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream Patch20:COLS-workaround.dif +# PATCH-FIX-OPENSUSE avoid name space trouble with latest libgppme +Patch21:mutt-1.6.2-gpgme_set_sender.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -148,6 +150,7 @@ %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 %patch20 -p0 -b .cols +%patch21 -p0 -b .ssend rm -vf README*.orig rm -vf PATCHES*.orig ++ mutt-1.5.23-carriage-return.path ++ --- crypt-gpgme.c |2 +- lib.c | 12 lib.h |1 + pager.c |2 +- pgp.c | 24 5 files changed, 27 insertions(+), 14 deletions(-) --- crypt-gpgme.c +++ crypt-gpgme.c 2016-11-23 10:06:56.163851435 + @@ -2313,7 +2313,7 @@ static void copy_clearsigned (gpgme_data if (armor_header) { - if (buf[0] == '\n') + if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) armor_header = 0; continue; } --- lib.c +++ lib.c 2013-05-29 09:31:53.0 + @@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha return strcmp(NONULL(a), NONULL(b)); } +int mutt_strxcmp(const char *a, const char *b) +{ + size_t xa, xb; + xa = strcspn(NONULL(a), "\r\n"); + xb = strcspn(NONULL(b), "\r\n"); + if (xb != xa) +return -1; + if (!xa) +return 0; + return strncmp(NONULL(a), NONULL(b), xa); +} + int mutt_strcasecmp(const char *a, const char *b) { return strcasecmp(NONULL(a), NONULL(b)); --- lib.h +++ lib.h 2013-05-29 09:25:22.0 + @@ -197,6 +197,7 @@ int mutt_copy_bytes (FILE *, FILE *, siz int mutt_rx_sanitize_string (char *, size_t, const char *); int mutt_strcasecmp (const char *, const char *); int mutt_strcmp (const char *, const char *); +int mutt_strxcmp (const char *, const char *); int mutt_strncasecmp (const char *, const char *, size_t); int mutt_strncmp (const char *, const char *, size_t); int mutt_strcoll (const char *, const char *); --- pager.c +++ pager.c 2013-05-29 09:31:53.0 + @@ -774,7 +774,7 @@ resolve_types (char *buf, char *raw, str else if (check_attachment_marker ((char *) raw) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; #endif - else if (mutt_strcmp ("-- \n", buf) == 0 || mutt_strcmp ("-- \r\n", buf) == 0) + else if (mutt_strxcmp ("-- \n", buf) == 0) { i = n + 1; --- pgp.c +++ pgp.c 2015-01-26 15:48:02.361518080 + @@ -302,7 +302,7 @@ static void pgp_copy_clearsigned (FILE * continue; } -if (mutt_strcmp (buf, "-BEGIN PGP SIGNATURE-\n") == 0) +if (mutt_strxcmp (buf, "-BEGIN PGP SIGNATURE-\n") == 0) break; if (armor_heade
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-09-21 18:50:03 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-07-28 23:47:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-09-21 18:50:05.0 +0200 @@ -1,0 +2,21 @@ +Tue Sep 13 10:05:16 UTC 2016 - wer...@suse.de + +- Update to neomutt 20160826 + Build: +Disable fmemopen until bug is fixed + Contrib: +Keybase portability improvements Joshua Jordi (@JakkinStewart) +Keybase Integration - Joshua Jordi (@JakkinStewart) + Bug Fixes: +Fix notmuch crash toggling virtual folders +Fix display of pager index when sidebar toggled +Sidebar's inbox occasionally shows zero/wrong value +Fix crash opening a second compressed mailbox + Config: +Look for /etc/NeoMuttrc and ~/.neomuttrc + Docs: +Fix broken links, typos +Update project link +Fix version string in the manual + +--- Old: neomutt-distro-20160723.tar.gz New: neomutt-distro-20160826.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.o0s44q/_old 2016-09-21 18:50:07.0 +0200 +++ /var/tmp/diff_new_pack.o0s44q/_new 2016-09-21 18:50:07.0 +0200 @@ -71,7 +71,7 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -%globalneo 20160723 +%globalneo 20160826 Version:1.6.2 Release:0 Summary:Mail Program @@ -121,19 +121,19 @@ %setup -q -n mutt-%version -a 10 for p in neomutt-distro-%neo/bugs-common/*.patch do -patch -p1 --fuzz=%_default_patch_fuzz < $p +patch -s -p1 --fuzz=%_default_patch_fuzz < $p done for p in neomutt-distro-%neo/features-common/*.patch do -patch -p1 --fuzz=%_default_patch_fuzz < $p +patch -s -p1 --fuzz=%_default_patch_fuzz < $p done for p in neomutt-distro-%neo/features-extra/*.patch do -patch -p1 --fuzz=%_default_patch_fuzz < $p +patch -s -p1 --fuzz=%_default_patch_fuzz < $p done for p in neomutt-distro-%neo/bugs-neomutt/*.patch do -patch -p1 --fuzz=%_default_patch_fuzz < $p +patch -s -p1 --fuzz=%_default_patch_fuzz < $p done %patch -p0 -b .p0 %patch2 -p0 -b .pgpewrap ++ COLS-workaround.dif ++ --- /var/tmp/diff_new_pack.o0s44q/_old 2016-09-21 18:50:07.0 +0200 +++ /var/tmp/diff_new_pack.o0s44q/_new 2016-09-21 18:50:07.0 +0200 @@ -5,8 +5,8 @@ 1 file changed, 8 insertions(+), 1 deletion(-) --- sidebar.c -+++ sidebar.c 2016-07-26 12:32:38.170166748 + -@@ -547,6 +547,7 @@ static int draw_divider (int first_row, sidebar.c 2016-09-13 10:03:50.282864137 + +@@ -579,6 +579,7 @@ static int draw_divider (int first_row, { /* Calculate the width of the delimiter in screen cells */ int delim_len = mutt_strwidth (SidebarDividerChar); @@ -14,7 +14,7 @@ if (delim_len < 1) return delim_len; -@@ -557,13 +558,19 @@ static int draw_divider (int first_row, +@@ -589,13 +590,19 @@ static int draw_divider (int first_row, if (delim_len > SidebarWidth) return -1; ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.o0s44q/_old 2016-09-21 18:50:08.0 +0200 +++ /var/tmp/diff_new_pack.o0s44q/_new 2016-09-21 18:50:08.0 +0200 @@ -8,14 +8,14 @@ 4 files changed, 27 insertions(+) --- PATCHES -+++ PATCHES2016-07-26 12:00:27.319169243 + PATCHES2016-09-13 10:01:22.837626357 + @@ -1,3 +1,4 @@ +patch-1.5.9.aw.listreply.1 - patch-new-mail-neo-git - patch-lmdb-neo-git - patch-nntp-neo-git + patch-compress-neo-git + patch-cond-date-neo-git + patch-fmemopen-neo-git --- init.h -+++ init.h 2016-07-26 11:59:58.319724690 + init.h 2016-09-13 10:00:49.794245364 + @@ -1501,6 +1501,13 @@ struct option_t MuttVars[] = { ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. @@ -31,8 +31,8 @@ /* ** .pp --- mutt.h -+++ mutt.h 2016-07-26 11:59:58.323724614 + -@@ -314,6 +314,7 @@ enum mutt.h 2016-09-13 10:00:49.794245364 + +@@ -315,6 +315,7 @@ enum #endif OPT_SUBJECT, OPT_VERIFYSIG, /* verify PGP signatures */ @@ -41,7 +41,7 @@ OPT_TOMODERATED, OPT_CATCHUP, --- send.c -+++ send.c 2016-07-26 11:59:58.323724614 + send.c 2016-09-13 10:00:49.794245364 + @@ -516,6 +516,7 @@ static int include_reply (CONTE
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-07-28 23:47:19 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-06-19 10:48:24.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-07-28 23:47:30.0 +0200 @@ -1,0 +2,62 @@ +Tue Jul 26 12:36:47 UTC 2016 - wer...@suse.de + +- Update to mutt version 1.6.2 (2016-07-01): + * send.c: Check $pgp_autoinline and $pgp_replyinline if oppenc is set. +(closes #3846) + * The first oppenc call takes place after the initial checks of +$pgp_autoline and $pgp_replyinline, and doesn't go through the pgp +menu. + * Therefore, check for $pgp_autoline and $pgp_replyinline if oppenc is +set too, to avoid oppenc enabling encryption without INLINE being +set in those cases. + * a6a4d6ed0f19 previously cleaned things up so that it is safe to set +INLINE even if encryption isn't enabled. + * keymap.c: Fix infinite loop when help is bound to a named key +combination. + * Commit a07e8215a0ef introduced a bug in km_error_key, which is +called when an unbound key is pressed. + * If help is bound to a sequence containing named keys (e.g. ), +the raw (untokenized) string would be pushed back into the unget +buffer. This could lead to an infinite loop of unbound key presses +triggering more unbound keys being put into the unget buffer. + * Change km_error_key to tokenize the string before putting it in the +unget buffer. + * Much thanks to Jiri Bohac for his bug report, analysis, and initial +patch! +- Update to neomutt 20160723 + New Features +New Mail Command - Execute a command on receipt of new mail +vim-keybindings - Mutt config for vim users +LMDB - In-memory header caching database +SMIME Encrypt to Self - Secure storage of sensitive email + Bug Fixes +rework mutt_draw_statusline() +fix cursor position after sidebar redraw +Add sidebar_format flag ‘%n’ to display ‘N’ on new mail. +fix index_format truncation problem +Fix compiler warnings due to always true condition +Change sidebar next/prev-new to look at buffy->new too. +Change the default for sidebar_format to use %n. +sidebar “unsorted” order to match Buffy list order. +Include ncurses tinfo library if found. +Sidebar width problem +sidebar crash for non-existent mailbox +Temporary compatibility workaround +Reset buffy->new for the current mailbox in IMAP. +version.sh regression +crash when notmuch tries to read a message (boo#986534) +status line wrapping +- Modify patches + * COLS-workaround.dif + * aw.listreply.diff + * bug-676388-largefile.patch + * mutt-1.5.15-wrapcolumn.diff + * mutt-1.5.20-sendgroupreplyto.diff + * mutt-1.5.21-mailcap.diff + * mutt-1.6.1-opennfs.dif + * patch-1.5.24.vk.pgp_verbose_mime + * widechar.sidebar.dif +- Rename patch mutt-1.6.1.dif to mutt-1.6.2.dif +- Delete patch mutt-1.5.21-tinfo.dif + +--- Old: mutt-1.5.21-tinfo.dif mutt-1.6.1-patches.tar.bz2 mutt-1.6.1.dif mutt-1.6.1.tar.gz neomutt-patches-20160611.tar.gz New: mutt-1.6.2.dif mutt-1.6.2.tar.gz neomutt-distro-20160723.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.6l2mtX/_old 2016-07-28 23:47:36.0 +0200 +++ /var/tmp/diff_new_pack.6l2mtX/_new 2016-07-28 23:47:36.0 +0200 @@ -71,8 +71,8 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -%globalneo 20160611 -Version:1.6.1 +%globalneo 20160723 +Version:1.6.2 Release:0 Summary:Mail Program License:GPL-2.0+ @@ -86,10 +86,9 @@ Source5:skel.muttrc Source6:krb5-config Source7:mutt-1.5.21.de.po -Source8:%name-%version-patches.tar.bz2 Source9:mutt.mailcap # http://www.neomutt.org/ -Source10: neomutt-patches-%{neo}.tar.gz +Source10: neomutt-distro-%neo.tar.gz Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ Patch2: %name-1.5.9i-pgpewrap.diff @@ -97,7 +96,6 @@ Patch4: %name-1.5.15-wrapcolumn.diff Patch7: mutt-1.6.1-opennfs.dif Patch9: bug-676388-largefile.patch -Patch10:mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch11:aw.listreply.diff Patch12:patch-1.5.24.vk.pgp_verbose_mime @@ -120,20 +118,29 @@ however. %prep -%setup -q -n mutt-
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-06-19 10:48:23 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-06-07 23:46:57.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-06-19 10:48:24.0 +0200 @@ -1,0 +2,22 @@ +Mon Jun 13 09:27:36 UTC 2016 - wer...@suse.de + +- Update to neomutt 20160611 + - Temporarily disable $sidebar_refresh_time +Unfortunately, this was causing too many problems. +It will be fixed and re-enabled as soon as possible. + - Fix several crashes, on startup, in Keywords + - Reflow text now works as it should + - Lots of typos fixed + - Compress config bug prevented it working + - Some minor bug-fixes from mutt/default + - Single quote at line beginning misinterpreted by groff + - Setting $sidebar_width to more than 128 would cause bad things to happen. + - Fix alignment in the compose menu. + - Fix sidebar buffy stats updating on mailbox close. +- Modify patch mutt-1.6.1.dif, that is skip upstream of neo as now + part of neo +- Adopt patches COLS-workaround.dif, aw.listreply.diff, + bug-676388-largefile.patch, mutt-1.5.21-tinfo.dif, + mutt-1.6.1-opennfs.dif, and patch-1.5.24.vk.pgp_verbose_mime + +--- Old: neomutt-patches-20160530.tar.gz New: neomutt-patches-20160611.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.bVxMqq/_old 2016-06-19 10:48:25.0 +0200 +++ /var/tmp/diff_new_pack.bVxMqq/_new 2016-06-19 10:48:25.0 +0200 @@ -71,7 +71,7 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -%globalneo 20160530 +%globalneo 20160611 Version:1.6.1 Release:0 Summary:Mail Program @@ -126,7 +126,7 @@ echo Patch $p patch -s -p1 < $p done -patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch +patch -s -p1 < ../neomutt-patches-%{neo}/mutt-%{version}/neomutt-%{neo}.patch %patch -p0 -b .p0 %patch2 -p0 -b .pgpewrap %patch3 -p0 -b .sendgroupreplyto ++ COLS-workaround.dif ++ --- /var/tmp/diff_new_pack.bVxMqq/_old 2016-06-19 10:48:25.0 +0200 +++ /var/tmp/diff_new_pack.bVxMqq/_new 2016-06-19 10:48:25.0 +0200 @@ -4,14 +4,13 @@ look well. --- - buffy.c |6 +++--- configure.ac |8 sidebar.c|9 - - 3 files changed, 19 insertions(+), 4 deletions(-) + 2 files changed, 16 insertions(+), 1 deletion(-) --- configure.ac -+++ configure.ac 2016-05-31 11:15:58.082946555 + -@@ -313,6 +313,14 @@ main () configure.ac 2016-06-13 09:03:34.248832759 + +@@ -312,6 +312,14 @@ main () if test x$mutt_cv_curses != x/usr; then LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" @@ -26,49 +25,34 @@ fi]) AC_CHECK_FUNC(initscr,,[ buffy.c -+++ buffy.c2016-05-31 12:24:04.232839516 + -@@ -756,10 +756,10 @@ int mutt_buffy_check (int force) - buffy_check(tmp, &contex_sb); - sb_set_update_time(); - } --#else -- for (tmp = Incoming; tmp; tmp = tmp->next) --buffy_check(tmp, &contex_sb); -+ else if (!option (OPTSIDEBAR)) - #endif -+for (tmp = Incoming; tmp; tmp = tmp->next) -+ buffy_check(tmp, &contex_sb); - - #ifdef USE_NOTMUCH - for (tmp = VirtIncoming; tmp; tmp = tmp->next) --- sidebar.c -+++ sidebar.c 2016-05-31 11:52:28.873409292 + -@@ -643,6 +643,7 @@ draw_divider (int first_row, int num_row sidebar.c 2016-06-13 09:10:18.201095164 + +@@ -651,6 +651,7 @@ static int draw_divider (int first_row, { - /* Calculate the width of the delimiter in screen cells */ - int delim_len = mutt_strwidth (SidebarDividerChar); -+ int altchar = 0; + /* Calculate the width of the delimiter in screen cells */ + int delim_len = mutt_strwidth (SidebarDividerChar); ++ int altchar = 0; + + if (delim_len < 1) + return delim_len; +@@ -661,13 +662,19 @@ static int draw_divider (int first_row, + if (delim_len > SidebarWidth) + return -1; - if (delim_len < 1) - return delim_len; -@@ -653,12 +654,18 @@ draw_divider (int first_row, int num_row - if (delim_len > SidebarWidth) - return -1; - -+ if (delim_len == 1 && strcmp(SidebarDividerChar, "|") == 0) -+ altchar++; ++ if (delim_len == 1 && strcmp(SidebarDiv
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-06-07 23:46:55 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-06-02 09:39:47.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-06-07 23:46:57.0 +0200 @@ -1,0 +2,5 @@ +Thu Jun 2 06:58:11 UTC 2016 - wer...@suse.de + +- Yet an other crash due keywords.patch (boo#982129) + +--- @@ -5 +10 @@ - standard mailbox + standard mailbox (boo#982129) Other differences: -- ++ mutt-1.6.1.dif ++ --- /var/tmp/diff_new_pack.zM6lUp/_old 2016-06-07 23:46:58.0 +0200 +++ /var/tmp/diff_new_pack.zM6lUp/_new 2016-06-07 23:46:58.0 +0200 @@ -3,10 +3,11 @@ doc/Makefile.in |2 - doc/Muttrc | 102 +--- doc/Muttrc.head |2 - + headers.c |9 imap/auth.c | 20 ++ init.h |3 + mx.c|3 + - 7 files changed, 112 insertions(+), 30 deletions(-) + 8 files changed, 121 insertions(+), 30 deletions(-) --- configure.ac +++ configure.ac 2016-05-31 11:11:35.279958476 + @@ -319,8 +320,28 @@ { /* NOTE: this _must_ be done before the check for mailcap! */ --- headers.c -+++ headers.c 2016-06-01 10:56:51.193585638 + -@@ -360,6 +360,9 @@ void mutt_scan_labels(CONTEXT *ctx) headers.c 2016-06-02 06:52:06.767101363 + +@@ -220,6 +220,9 @@ void mutt_label_ref_dec(ENVELOPE *env) + uintptr_t count; + LIST *label; + ++ if (!Labels) ++return; ++ + for (label = env->labels; label; label = label->next) + { + if (label->data == NULL) +@@ -241,6 +244,9 @@ void mutt_label_ref_inc(ENVELOPE *env) + uintptr_t count; + LIST *label; + ++ if (!Labels) ++return; ++ + for (label = env->labels; label; label = label->next) + { + if (label->data == NULL) +@@ -360,6 +366,9 @@ void mutt_scan_labels(CONTEXT *ctx) { int i;
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-06-02 09:39:46 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-05-24 09:35:20.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-06-02 09:39:47.0 +0200 @@ -1,0 +2,13 @@ +Wed Jun 1 11:04:06 UTC 2016 - wer...@suse.de + +- Fix crash due keywords.patch which stumble over not existing + standard mailbox + +--- +Tue May 31 12:35:33 UTC 2016 - wer...@suse.de + +- Update to neomutt 20160530 +- Avoid sidebar patch from bother other users (boo#982129) +- Remove patch patch-1.6.1.rr.compressed.bz2 as now part of neumutt + +--- Old: neomutt-patches-20160502.tar.gz patch-1.6.1.rr.compressed.bz2 New: neomutt-patches-20160530.tar.gz Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.y1D8Zc/_old 2016-06-02 09:39:49.0 +0200 +++ /var/tmp/diff_new_pack.y1D8Zc/_new 2016-06-02 09:39:49.0 +0200 @@ -71,7 +71,7 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE -%globalneo 20160502 +%globalneo 20160530 Version:1.6.1 Release:0 Summary:Mail Program @@ -92,7 +92,6 @@ Source10: neomutt-patches-%{neo}.tar.gz Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ -Patch1: patch-1.6.1.rr.compressed.bz2 Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff @@ -128,8 +127,7 @@ patch -s -p1 < $p done patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch -%patch -%patch1 -p0 -b .compressed +%patch -p0 -b .p0 %patch2 -p0 -b .pgpewrap %patch3 -p0 -b .sendgroupreplyto %patch4 -p0 -b .wrapcolumn ++ COLS-workaround.dif ++ --- /var/tmp/diff_new_pack.y1D8Zc/_old 2016-06-02 09:39:49.0 +0200 +++ /var/tmp/diff_new_pack.y1D8Zc/_new 2016-06-02 09:39:49.0 +0200 @@ -1,13 +1,17 @@ Current neomutt sidebar patch does change COLS which does -not work with threadsafe ncurses6 +not work with threadsafe ncurses6. Beside this: do not +bother other non-sidebar users as well make sidebar delimeter +look well. --- + buffy.c |6 +++--- configure.ac |8 - 1 file changed, 8 insertions(+) + sidebar.c|9 - + 3 files changed, 19 insertions(+), 4 deletions(-) --- configure.ac -+++ configure.ac 2016-05-23 13:43:40.810914709 + -@@ -305,6 +305,14 @@ main () configure.ac 2016-05-31 11:15:58.082946555 + +@@ -313,6 +313,14 @@ main () if test x$mutt_cv_curses != x/usr; then LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" @@ -22,3 +26,49 @@ fi]) AC_CHECK_FUNC(initscr,,[ +--- buffy.c buffy.c2016-05-31 12:24:04.232839516 + +@@ -756,10 +756,10 @@ int mutt_buffy_check (int force) + buffy_check(tmp, &contex_sb); + sb_set_update_time(); + } +-#else +- for (tmp = Incoming; tmp; tmp = tmp->next) +-buffy_check(tmp, &contex_sb); ++ else if (!option (OPTSIDEBAR)) + #endif ++for (tmp = Incoming; tmp; tmp = tmp->next) ++ buffy_check(tmp, &contex_sb); + + #ifdef USE_NOTMUCH + for (tmp = VirtIncoming; tmp; tmp = tmp->next) +--- sidebar.c sidebar.c 2016-05-31 11:52:28.873409292 + +@@ -643,6 +643,7 @@ draw_divider (int first_row, int num_row + { + /* Calculate the width of the delimiter in screen cells */ + int delim_len = mutt_strwidth (SidebarDividerChar); ++ int altchar = 0; + + if (delim_len < 1) + return delim_len; +@@ -653,12 +654,18 @@ draw_divider (int first_row, int num_row + if (delim_len > SidebarWidth) + return -1; + ++ if (delim_len == 1 && strcmp(SidebarDividerChar, "|") == 0) ++ altchar++; ++ + SETCOLOR(MT_COLOR_DIVIDER); + + int i; + for (i = 0; i < num_rows; i++) { + move (first_row + i, SidebarWidth - delim_len); +- addstr (NONULL(SidebarDividerChar)); ++ if (altchar) ++ addch (ACS_VLINE); ++ else ++ addstr (NONULL(SidebarDividerChar)); + } + + return delim_len; ++ aw.listreply.diff ++ --- /var/tmp/diff
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-05-24 09:35:18 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-05-17 17:15:26.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-05-24 09:35:20.0 +0200 @@ -1,0 +2,7 @@ +Fri May 20 15:14:52 UTC 2016 - wer...@suse.de + +- Enable some of the new patches like sidebar (boo#980830) +- Add patch COLS-workaround.dif which should become removed once + the sidebar patch does not modify COLS anymore + +--- New: COLS-workaround.dif Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.g6yL5g/_old 2016-05-24 09:35:21.0 +0200 +++ /var/tmp/diff_new_pack.g6yL5g/_new 2016-05-24 09:35:21.0 +0200 @@ -43,6 +43,9 @@ BuildRequires: libxslt BuildRequires: lynx BuildRequires: ncurses-devel +%if 0%{?is_opensuse} +BuildRequires: notmuch-devel +%endif BuildRequires: postfix BuildRequires: sgml-skel BuildRequires: update-desktop-files @@ -107,6 +110,8 @@ Patch18:mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19:bsc907453-CVE-2014-9116-jessie.patch +# PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream +Patch20:COLS-workaround.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -137,6 +142,7 @@ %patch16 -p0 -b .crlf %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 +%patch20 -p0 -b .cols rm -vf README*.orig rm -vf PATCHES*.orig @@ -200,6 +206,11 @@ --enable-nfs-fix \ --enable-mailtool \ --enable-compressed \ + --enable-sidebar \ +%if 0%{?is_opensuse} + --enable-notmuch \ +%endif + --enable-hcache \ --disable-external-dotlock \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ ++ COLS-workaround.dif ++ Current neomutt sidebar patch does change COLS which does not work with threadsafe ncurses6 --- configure.ac |8 1 file changed, 8 insertions(+) --- configure.ac +++ configure.ac2016-05-23 13:43:40.810914709 + @@ -305,6 +305,14 @@ main () if test x$mutt_cv_curses != x/usr; then LDFLAGS="$LDFLAGS -L${mutt_cv_curses}/lib" CPPFLAGS="$CPPFLAGS -I${mutt_cv_curses}/include" +fi +if test -d /usr/include/ncurses5 ; then +if test -d /usr/lib64/ncurses5 ; then +LDFLAGS="$LDFLAGS -L/usr/lib64/ncurses5" +else +LDFLAGS="$LDFLAGS -L/usr/lib/ncurses5" +fi +CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses5" fi]) AC_CHECK_FUNC(initscr,,[
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-05-17 17:15:24 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-04-14 13:07:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-05-17 17:15:26.0 +0200 @@ -1,0 +2,28 @@ +Thu May 12 13:50:14 UTC 2016 - wer...@suse.de + +- Update to mutt version 1.6.1 (2016-05-01): + ! Bug fix release. No features were modified or added. +- Add and use neomutt-patches-20160502.tar.gz from + http://www.neomutt.org/ +- Modify the patches + aw.listreply.diff + bsc907453-CVE-2014-9116-jessie.patch + bug-676388-largefile.patch + mutt-1.5.15-wrapcolumn.diff + mutt-1.5.20-sendgroupreplyto.diff + mutt-1.5.21-mailcap.diff + mutt-1.5.21-tinfo.dif + mutt-1.5.23-cariage-return.path + mutt-1.5.9i-pgpewrap.diff + patch-1.5.24.vk.pgp_verbose_mime + widechar.sidebar.dif +- Modify and rename the patches + mutt-1.6.0-opennfs.dif becomes mutt-1.6.1-opennfs.dif + mutt-1.6.0.dif becomes mutt-1.6.1.dif + patch-1.6.0.rr.compressed.bz2 becomes patch-1.6.1.rr.compressed.bz2 +- Remove the patches + patch-1.6.0.sidebar.20160411.patch + nion.sidebar-color.diff + now upstream or part of neomutt patch collection + +--- Old: mutt-1.6.0-opennfs.dif mutt-1.6.0-patches.tar.bz2 mutt-1.6.0.dif mutt-1.6.0.tar.gz nion.sidebar-color.diff patch-1.6.0.rr.compressed.bz2 patch-1.6.0.sidebar.20160411.patch New: mutt-1.6.1-opennfs.dif mutt-1.6.1-patches.tar.bz2 mutt-1.6.1.dif mutt-1.6.1.tar.gz neomutt-patches-20160502.tar.gz patch-1.6.1.rr.compressed.bz2 Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.0 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.0 +0200 @@ -68,7 +68,8 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires:desktop-data-SuSE -Version:1.6.0 +%globalneo 20160502 +Version:1.6.1 Release:0 Summary:Mail Program License:GPL-2.0+ @@ -84,21 +85,20 @@ Source7:mutt-1.5.21.de.po Source8:%name-%version-patches.tar.bz2 Source9:mutt.mailcap +# http://www.neomutt.org/ +Source10: neomutt-patches-%{neo}.tar.gz Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ -Patch1: patch-%version.rr.compressed.bz2 +Patch1: patch-1.6.1.rr.compressed.bz2 Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff -# http://www.lunar-linux.org/mutt-sidebar/ -Patch6: patch-1.6.0.sidebar.20160411.patch -Patch7: mutt-1.6.0-opennfs.dif +Patch7: mutt-1.6.1-opennfs.dif Patch9: bug-676388-largefile.patch Patch10:mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch11:aw.listreply.diff Patch12:patch-1.5.24.vk.pgp_verbose_mime -Patch14:nion.sidebar-color.diff # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler Patch15:widechar.sidebar.dif # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF @@ -116,28 +116,29 @@ however. %prep -%setup -q -n mutt-%version -b 8 +%setup -q -n mutt-%version -b 8 -b 10 for p in ../%name-%version-patches/*; do test -e $p || break echo Patch $p patch -s -p1 < $p done +patch -s -p1 < ../neomutt-patches-%{neo}/neomutt-%{neo}.patch %patch %patch1 -p0 -b .compressed %patch2 -p0 -b .pgpewrap -%patch3 -p1 -b .sendgroupreplyto +%patch3 -p0 -b .sendgroupreplyto %patch4 -p0 -b .wrapcolumn -%patch6 -p1 -b .sidebar %patch7 -p0 -b .opennfs -%patch9 -p1 -b .largefile +%patch9 -p0 -b .largefile %patch10 -p0 -b .tinfo -%patch11 -p1 -b .listreply +%patch11 -p0 -b .listreply %patch12 -p0 -b .pgp_verbose_mtime -%patch14 -p1 -b .sidebar.color -%patch15 -p1 -b .widechar.sidebar +%patch15 -p0 -b .widechar.sidebar %patch16 -p0 -b .crlf -%patch18 -p1 -b .mailcap -%patch19 -p1 -b .cvw2014.9116 +%patch18 -p0 -b .mailcap +%patch19 -p0 -b .cvw2014.9116 +rm -vf README*.orig +rm -vf PATCHES*.orig cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.z1tdOb/_old 2016-05-17 17:15:28.0 +0200 +++ /var/tmp/diff_new_pack.z1tdOb/_new 2016-05-17 17:15:28.0 +0200 @@ -7,15 +7,16 @@ send.c | 18 ++ 4 files changed, 27 insertion
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-04-14 13:07:27 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-03-07 13:24:14.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-04-14 13:07:29.0 +0200 @@ -1,0 +2,42 @@ +Mon Apr 11 12:04:29 UTC 2016 - wer...@suse.de + +- Update to mutt version 1.6.0 (2016-04-04): + + Enabled utf-8 mailbox support for IMAP. + + New expandos %r and %R for comma separated list of To: and Cc: +recipients respectively. + + Improved support for internationalized email and SMTPUTF8 (RFC653[0-3]). + ! $use_idn has been renamed to $idn_decode. + + $idn_encode controls whether outgoing email address domains will +be IDNA encoded. If your MTA supports it, unset to use utf-8 +email address domains. + + The S/MIME message digest algorithm is now specified using the +option $smime_sign_digest_alg. Note that $smime_sign_command +should be modified to include "-md %d". Please see +contrib/smime.rc. + + $reflow_space_quotes allows format=flowed email quotes to be +displayed with spacing between them. + ! multipart draft files are now supported. + + The "-E" command line argument causes mutt to edit draft or include files. +All changes made in mutt will be saved back out to those files. + + $resume_draft_files and $resume_edited_draft_files control how +mutt processes draft files. + + For classic gpg mode, $pgp_decryption_okay should be set to verify +multipart/encrypted are actually encrypted. Please see +contrib/gpg.rc for the suggested value. + ! mailto URL header parameters by default are now restricted to +'body' and 'subject'. + + mailto_allow and unmailto_allow can be used to add or remove +allowed mailto header parameters. + ! The method of setting $hostname has been changed. Rather than +scanning /etc/resolv.conf, the domain will now be determined using +DNS calls. +- Modfied patches + aw.listreply.diff + patch-1.5.24.vk.pgp_verbose_mime +- Ported patches + mutt-1.5.24.dif becomes mutt-1.6.0.dif + mutt-1.5.24-opennfs.dif becomes mutt-1.6.0-opennfs.dif + patch-1.5.24.rr.compressed.bz2 becomes patch-1.6.0.rr.compressed.bz2 + patch-1.5.24.sidebar.2015.patch becomes patch-1.6.0.sidebar.20160411.patch + +--- Old: mutt-1.5.24-opennfs.dif mutt-1.5.24-patches.tar.bz2 mutt-1.5.24.dif mutt-1.5.24.tar.gz patch-1.5.24.rr.compressed.bz2 patch-1.5.24.sidebar.2015.patch New: mutt-1.6.0-opennfs.dif mutt-1.6.0-patches.tar.bz2 mutt-1.6.0.dif mutt-1.6.0.tar.gz patch-1.6.0.rr.compressed.bz2 patch-1.6.0.sidebar.20160411.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.8ME1Ga/_old 2016-04-14 13:07:31.0 +0200 +++ /var/tmp/diff_new_pack.8ME1Ga/_new 2016-04-14 13:07:31.0 +0200 @@ -68,7 +68,7 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires:desktop-data-SuSE -Version:1.5.24 +Version:1.6.0 Release:0 Summary:Mail Program License:GPL-2.0+ @@ -90,9 +90,9 @@ Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff -# http://lunar-linux.org/mutt-sidebar -Patch6: patch-1.5.24.sidebar.2015.patch -Patch7: mutt-1.5.24-opennfs.dif +# http://www.lunar-linux.org/mutt-sidebar/ +Patch6: patch-1.6.0.sidebar.20160411.patch +Patch7: mutt-1.6.0-opennfs.dif Patch9: bug-676388-largefile.patch Patch10:mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.8ME1Ga/_old 2016-04-14 13:07:31.0 +0200 +++ /var/tmp/diff_new_pack.8ME1Ga/_new 2016-04-14 13:07:31.0 +0200 @@ -11,7 +11,7 @@ +++ mutt-1.5.23/PATCHES2015-01-26 15:34:40.133518493 + @@ -1,2 +1,3 @@ +patch-1.5.9.aw.listreply.1 - patch-1.5.24.sidebar.2015.txt + patch-1.6.0.sidebar.20160404.txt rr.compressed --- mutt-1.5.23/init.h +++ mutt-1.5.23/init.h 2012-06-21 09:48:22.0 + @@ -19,11 +19,11 @@ ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. */ -+ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO }, ++ { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO }, + /* + *
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-03-07 13:23:48 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-02-18 12:35:53.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-03-07 13:24:14.0 +0100 @@ -1,0 +2,6 @@ +Mon Feb 29 15:22:58 UTC 2016 - wer...@suse.de + +- Add perl(Expect) as requirement for mutt due to the fact that a + useful helper script below the samples depends on this (boo#968699) + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.MDClYO/_old 2016-03-07 13:24:16.0 +0100 +++ /var/tmp/diff_new_pack.MDClYO/_new 2016-03-07 13:24:16.0 +0100 @@ -64,6 +64,7 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif +Requires: perl(Expect) # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires:desktop-data-SuSE
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-02-18 11:07:02 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2016-01-07 00:24:45.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-02-18 12:35:53.0 +0100 @@ -1,0 +2,6 @@ +Tue Jan 12 08:46:42 UTC 2016 - vmik...@collabora.co.uk + +- Fix patch-1.5.24.sidebar.2015.patch to shorten + imaps://imap.example.com/INBOX correctly to INBOX, not to NBOX. (boo#961470) + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.Ch2JdY/_old 2016-02-18 12:35:55.0 +0100 +++ /var/tmp/diff_new_pack.Ch2JdY/_new 2016-02-18 12:35:55.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++ patch-1.5.24.sidebar.2015.patch ++ --- /var/tmp/diff_new_pack.Ch2JdY/_old 2016-02-18 12:35:55.0 +0100 +++ /var/tmp/diff_new_pack.Ch2JdY/_new 2016-02-18 12:35:55.0 +0100 @@ -1892,7 +1892,7 @@ + /* calculate depth of current folder and generate its display name with indented spaces */ + int sidebar_folder_depth = 0; + char *sidebar_folder_name; -+ sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1); ++ sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir)); + if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) { + char *tmp_folder_name; + int i;
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-01-07 00:24:41 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2015-09-13 09:45:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-01-07 00:24:45.0 +0100 @@ -1,0 +2,16 @@ +Tue Dec 22 09:44:55 UTC 2015 - vmik...@collabora.co.uk + +- Update patch-1.5.24.sidebar.20140412.patch to + patch-1.5.24.sidebar.2015.patch + + Updated patch for pristine mutt-1.5.24 source package. + + Corrected the version info in PATCHES for mutt-1.5.24 and added two small +patches courtesy of mutt user flatcap. The patch makes %S optional in +sidebar_format_str and the other patch fixes a problem with viewing an imap +folder that gets deleted by another user which causes a mutt crash. +- Modified patches + + aw.listreply.diff + + nion.sidebar-color.diff + + patch-1.5.24.vk.pgp_verbose_mime + + widechar.sidebar.dif + +--- Old: patch-1.5.24.sidebar.20140412.patch New: patch-1.5.24.sidebar.2015.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.mn54XG/_old 2016-01-07 00:24:48.0 +0100 +++ /var/tmp/diff_new_pack.mn54XG/_new 2016-01-07 00:24:48.0 +0100 @@ -90,7 +90,7 @@ Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff # http://lunar-linux.org/mutt-sidebar -Patch6: patch-1.5.24.sidebar.20140412.patch +Patch6: patch-1.5.24.sidebar.2015.patch Patch7: mutt-1.5.24-opennfs.dif Patch9: bug-676388-largefile.patch Patch10:mutt-1.5.21-tinfo.dif @@ -126,14 +126,14 @@ %patch2 -p0 -b .pgpewrap %patch3 -p1 -b .sendgroupreplyto %patch4 -p0 -b .wrapcolumn -%patch6 -p0 -b .sidebar +%patch6 -p1 -b .sidebar %patch7 -p0 -b .opennfs %patch9 -p1 -b .largefile %patch10 -p0 -b .tinfo %patch11 -p1 -b .listreply %patch12 -p0 -b .pgp_verbose_mtime -%patch14 -p2 -b .sidebar.color -%patch15 -p0 -b .widechar.sidebar +%patch14 -p1 -b .sidebar.color +%patch15 -p1 -b .widechar.sidebar %patch16 -p0 -b .crlf %patch18 -p1 -b .mailcap %patch19 -p1 -b .cvw2014.9116 ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.mn54XG/_old 2016-01-07 00:24:48.0 +0100 +++ /var/tmp/diff_new_pack.mn54XG/_new 2016-01-07 00:24:48.0 +0100 @@ -11,7 +11,7 @@ +++ mutt-1.5.23/PATCHES2015-01-26 15:34:40.133518493 + @@ -1,2 +1,3 @@ +patch-1.5.9.aw.listreply.1 - patch-1.5.23.sidebar.20140412.txt + patch-1.5.24.sidebar.2015.txt rr.compressed --- mutt-1.5.23/init.h +++ mutt-1.5.23/init.h 2012-06-21 09:48:22.0 + ++ nion.sidebar-color.diff ++ --- /var/tmp/diff_new_pack.mn54XG/_old 2016-01-07 00:24:48.0 +0100 +++ /var/tmp/diff_new_pack.mn54XG/_new 2016-01-07 00:24:48.0 +0100 @@ -1,16 +1,17 @@ -diff --git a/mutt-1.5.24/color.c b/mutt-1.5.24/color.c a/mutt-1.5.24/color.c -+++ b/mutt-1.5.24/color.c -@@ -95,6 +95,7 @@ static const struct mapping_t Fields[] = - { "index", MT_COLOR_INDEX }, +diff --git a/color.c b/color.c +index d6f9198..37786bc 100644 +--- a/color.c b/color.c +@@ -96,6 +96,7 @@ static const struct mapping_t Fields[] = + { "prompt", MT_COLOR_PROMPT }, { "sidebar_new",MT_COLOR_NEW }, { "sidebar_flagged",MT_COLOR_FLAGGED }, -+ { "sidebar",MT_COLOR_SIDEBAR }, - { "prompt", MT_COLOR_PROMPT }, ++ { "sidebar", MT_COLOR_SIDEBAR }, { NULL, 0 } }; + @@ -145,6 +146,7 @@ void ci_start_color (void) /* set some defaults */ @@ -19,9 +20,10 @@ ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE; ColorDefs[MT_COLOR_SEARCH] = A_REVERSE; ColorDefs[MT_COLOR_MARKERS] = A_REVERSE; -diff --git a/mutt-1.5.24/mutt_curses.h b/mutt-1.5.24/mutt_curses.h a/mutt-1.5.24/mutt_curses.h -+++ b/mutt-1.5.24/mutt_curses.h +diff --git a/mutt_curses.h b/mutt_curses.h +index ef9884e..b2e88c8 100644 +--- a/mutt_curses.h b/mutt_curses.h @@ -119,6 +119,7 @@ enum MT_COLOR_ATTACHMENT, MT_COLOR_SEARCH, @@ -29,11 +31,12 @@ + MT_COLOR_SIDEBAR, MT_COLOR_UNDERLINE, MT_COLOR_INDEX, - MT_COLOR_NEW, -diff --git a/mutt-1.5.24/sidebar.c b/mutt-1.5.24/sidebar.c a/mutt-1.5.24/sidebar.c -+++ b/mutt-1.5.24/sidebar.c -@@ -250,13 +250,14 @@ int draw_sidebar(int menu) { + MT_COLOR_PROMPT, +diff --git a/sidebar.c b/sidebar.c +index e9d9eba..8b46bff 100644 +--- a/sidebar.c b/sidebar.c +@@ -254,13 +254,14 @@ int draw_sidebar(int menu)
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2015-09-13 09:45:21 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2015-01-27 09:09:25.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2015-09-13 09:45:28.0 +0200 @@ -1,0 +2,46 @@ +Fri Sep 11 15:14:48 UTC 2015 - wer...@suse.de + +- Update to mutt version 1.5.24 + + terminal status-line (TS) support, a.k.a. xterm title. see the + following variables: $ts_enabled, $ts_icon_format, $ts_status_format + ! $ssl_use_sslv3 is disabled by default. + ! command-line arguments: -H now combines template and command-line + address arguments. + ! GnuPG signature name is set to signature.asc + + New color object "prompt" added. + + Ability to encrypt postponed messages. See $postpone_encrypt and + $postpone_encrypt_as. + ! History ring now has a scratch buffer. + ! mail-key is implemented for GPGME. (Requires a recent GPGME). + ! Removed GPG_AGENT_INFO check for GnuPG 2.1 compatibility. Please + set pgp_use_gpg_agent if using GnuPG 2.1 or later. + ! $smime_encrypt_with now defaults to aes256. + ! GnuPG fingerprints are used internally when possible. + "--with-fingerprint" should be added to $pgp_list_pubring_command and + $pgp_list_secring_command to enable this. Please see contrib/gpg.rc. + Fingerprints may also be used at the prompts for key selection. + + $crypt_opportunistic_encrypt automatically enables/disables encryption + based on message recipients. + ! Attachments for signed, unencrypted emails may be deleted. + ! Multiple crypt-hooks may be defined for the same regexp. + This means multiple keys may be used for a recipient. + + $crypt_confirmhook allows the confirmation prompt for crypt-hooks to + be disabled. + + $ssl_ciphers allows the SSL ciphers to be directly set. + ! sime_keys better handles importing certificate chains. + ! sime_keys now records certificate purposes (sign/encrypt). Run + "sime_keys refresh" to update smime index files. + + $maildir_check_cur polls the maildir "cur" directory for new mail. +- Ported patches + patch-1.5.21.vk.pgp_verbose_mime becomes patch-1.5.24.vk.pgp_verbose_mime + patch-1.5.23.rr.compressed.bz2 becomes patch-1.5.24.rr.compressed.bz2 + patch-1.5.23.sidebar.20140412.patch becomes patch-1.5.24.sidebar.20140412.patch + mutt-1.5.21-opennfs.dif becomes mutt-1.5.24-opennfs.dif + mutt-1.5.23.dif becomes mutt-1.5.24.dif +- Modfied patches + nion.sidebar-color.diff + widechar.sidebar.dif +- Removed patch + patch-1.5.23.xtitles.patch + +--- Old: mutt-1.5.21-opennfs.dif mutt-1.5.23-patches.tar.bz2 mutt-1.5.23.dif mutt-1.5.23.tar.gz patch-1.5.21.vk.pgp_verbose_mime patch-1.5.23.rr.compressed.bz2 patch-1.5.23.sidebar.20140412.patch patch-1.5.23.xtitles.patch New: mutt-1.5.24-opennfs.dif mutt-1.5.24-patches.tar.bz2 mutt-1.5.24.dif mutt-1.5.24.tar.gz patch-1.5.24.rr.compressed.bz2 patch-1.5.24.sidebar.20140412.patch patch-1.5.24.vk.pgp_verbose_mime Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.O8eFfR/_old 2015-09-13 09:45:29.0 +0200 +++ /var/tmp/diff_new_pack.O8eFfR/_new 2015-09-13 09:45:29.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,7 @@ BuildRequires: cyrus-sasl-gssapi BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 +BuildRequires: fdupes BuildRequires: gdbm-devel BuildRequires: glibc-i18ndata BuildRequires: ispell @@ -66,8 +67,8 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires:desktop-data-SuSE -Version:1.5.23 -Release:33.2 +Version:1.5.24 +Release:0 Summary:Mail Program License:GPL-2.0+ Group: Productivity/Networking/Email/Clients @@ -88,15 +89,14 @@ Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff -Patch5: patch-1.5.23.xtitles.patch # http://lunar-linux.org/mutt-sidebar -Patch6: patch-1.5.23.sidebar.20140412.patch -Patch7: mutt-1.5.21-opennfs.dif +Patch6: patch-1.5.24.sidebar.20140412.patch +Patch7: mu
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2015-01-27 09:09:21 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2014-12-16 14:47:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2015-01-27 09:09:25.0 +0100 @@ -1,0 +2,16 @@ +Mon Jan 26 16:22:08 UTC 2015 - wer...@suse.de + +- Update to mutt version 1.5.23 which is a security bugfix release + as well as add support for TLS 1.1/1.2 +- Remove the patches automake-1.12.patch, + mutt-1.5.20-gpgme_set_locale.patch, and mutt-CVE-2014-0467.patch +- Replace the patches + patch-1.5.23.rr.compressed.bz2 with patch-1.5.21.rr.compressed.1.bz2 + mutt-1.5.21.sidebar.20120829.patch with patch-1.5.23.sidebar.20140412.patch + patch-1.5.5.1.nt.xtitles.3.ab.1 with patch-1.5.23.xtitles.patch + mutt-1.5.21.dif with mutt-1.5.23.dif +- Modify the patches aw.listreply.diff, bug-676388-largefile.patch, + and bsc907453-CVE-2014-9116-jessie.patch +- Build with PIE + +--- Old: automake-1.12.patch mutt-1.5.20-gpgme_set_locale.patch mutt-1.5.21-cariage-return.path mutt-1.5.21-patches.tar.bz2 mutt-1.5.21.dif mutt-1.5.21.sidebar.20120829.patch mutt-1.5.21.tar.bz2 mutt-CVE-2014-0467.patch patch-1.5.21.rr.compressed.1.bz2 patch-1.5.5.1.nt.xtitles.3.ab.1 New: mutt-1.5.23-cariage-return.path mutt-1.5.23-patches.tar.bz2 mutt-1.5.23.dif mutt-1.5.23.tar.gz patch-1.5.23.rr.compressed.bz2 patch-1.5.23.sidebar.20140412.patch patch-1.5.23.xtitles.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.qN4w5s/_old 2015-01-27 09:09:27.0 +0100 +++ /var/tmp/diff_new_pack.qN4w5s/_new 2015-01-27 09:09:27.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -57,6 +57,7 @@ Provides: muttssl Obsoletes: muttssl Recommends: smtp_daemon +Recommends: urlview Recommends: w3m %if 0%{?suse_version} > 1130 Requires(post): shared-mime-info @@ -65,13 +66,13 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires:desktop-data-SuSE -Version:1.5.21 +Version:1.5.23 Release:33.2 Summary:Mail Program License:GPL-2.0+ Group: Productivity/Networking/Email/Clients # ftp://ftp.mutt.org/mutt/devel/ -Source0:%name-%version.tar.bz2 +Source0:https://bitbucket.org/mutt/mutt/downloads/%name-%version.tar.gz Source1:Signature_conversion Source2:README.alternates Source3:mutt.png @@ -83,28 +84,24 @@ Source9:mutt.mailcap Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ -Patch1: patch-%version.rr.compressed.1.bz2 +Patch1: patch-%version.rr.compressed.bz2 Patch2: %name-1.5.9i-pgpewrap.diff Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff -Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 +Patch5: patch-1.5.23.xtitles.patch # http://lunar-linux.org/mutt-sidebar -Patch6: mutt-1.5.21.sidebar.20120829.patch +Patch6: patch-1.5.23.sidebar.20140412.patch Patch7: mutt-1.5.21-opennfs.dif -Patch8: mutt-1.5.20-gpgme_set_locale.patch Patch9: bug-676388-largefile.patch Patch10:mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch11:aw.listreply.diff Patch12:patch-1.5.21.vk.pgp_verbose_mime -Patch13:automake-1.12.patch Patch14:nion.sidebar-color.diff # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler Patch15:widechar.sidebar.dif # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF -Patch16:mutt-1.5.21-cariage-return.path -# PATCH-FIX-SUSE: bnc#868115 - CVE-2014-0467: mutt: crash due to malicious email -Patch17:mutt-CVE-2014-0467.patch +Patch16:mutt-1.5.23-cariage-return.path # PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html Patch18:mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() @@ -132,16 +129,13 @@ %patch5 -p1 -b .xtitles %patch6 -p1 -b .s
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2014-12-16 14:48:06 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2014-11-24 11:09:15.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2014-12-16 14:47:30.0 +0100 @@ -1,0 +2,6 @@ +Thu Dec 4 12:03:10 UTC 2014 - wer...@suse.de + +- Add patch bsc907453-CVE-2014-9116-jessie.patch to fix bsc#907453 + CVE-2014-9116: heap-based buffer overflow in mutt_substrdup() + +--- New: bsc907453-CVE-2014-9116-jessie.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.VQX0rR/_old 2014-12-16 14:47:33.0 +0100 +++ /var/tmp/diff_new_pack.VQX0rR/_new 2014-12-16 14:47:33.0 +0100 @@ -107,6 +107,8 @@ Patch17:mutt-CVE-2014-0467.patch # PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html Patch18:mutt-1.5.21-mailcap.diff +# PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() +Patch19:bsc907453-CVE-2014-9116-jessie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -141,6 +143,7 @@ %patch16 -p0 -b .crlf %patch17 -p1 -b .cve.2014.0467 %patch18 -p1 -b .mailcap +%patch19 -p1 -b .cvw2014.9116 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ bsc907453-CVE-2014-9116-jessie.patch ++ This patch solves the issue raised by CVE-2014-9116 in bug 771125. We correctly redefine what are the whitespace characters as per RFC5322; by doing so we prevent mutt_substrdup from being used in a way that could lead to a segfault. The lib.c part was written by Antonio Radici to prevent crashes due to this kind of bugs from happening again. The wheezy version of this patch is slightly different, therefore this patch has -jessie prefixed in its name. Index: mutt/lib.c === --- mutt/lib.c +++ mutt/lib.c @@ -819,6 +819,9 @@ char *mutt_substrdup (const char *begin, size_t len; char *p; + if (end != NULL && end < begin) +return NULL; + if (end) len = end - begin; else Index: mutt/sendlib.c === --- mutt/sendlib.c +++ mutt/sendlib.c @@ -1814,7 +1814,11 @@ static int write_one_header (FILE *fp, i { tagbuf = mutt_substrdup (start, t); ++t; /* skip over the colon separating the header field name and value */ - SKIPWS(t); /* skip over any leading whitespace */ + + /* skip over any leading whitespace (WSP, as defined in RFC5322) */ + while (*t == ' ' || *t == '\t') + t++; + valbuf = mutt_substrdup (t, end); } dprint(4,(debugfile,"mwoh: buf[%s%s] too long, " -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2014-11-24 11:09:00 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2014-03-26 16:41:28.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2014-11-24 11:09:15.0 +0100 @@ -1,0 +2,6 @@ +Tue Nov 18 08:15:09 UTC 2014 - lnus...@suse.de + +- handle text/html by default (bnc#899712) + that is add patch mutt-1.5.21-mailcap.diff + +--- New: mutt-1.5.21-mailcap.diff mutt.mailcap Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.9jIrjo/_old 2014-11-24 11:09:17.0 +0100 +++ /var/tmp/diff_new_pack.9jIrjo/_new 2014-11-24 11:09:17.0 +0100 @@ -57,6 +57,7 @@ Provides: muttssl Obsoletes: muttssl Recommends: smtp_daemon +Recommends: w3m %if 0%{?suse_version} > 1130 Requires(post): shared-mime-info Requires(postun): shared-mime-info @@ -79,6 +80,7 @@ Source6:krb5-config Source7:mutt-1.5.21.de.po Source8:%name-%version-patches.tar.bz2 +Source9:mutt.mailcap Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ Patch1: patch-%version.rr.compressed.1.bz2 @@ -103,6 +105,8 @@ Patch16:mutt-1.5.21-cariage-return.path # PATCH-FIX-SUSE: bnc#868115 - CVE-2014-0467: mutt: crash due to malicious email Patch17:mutt-CVE-2014-0467.patch +# PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html +Patch18:mutt-1.5.21-mailcap.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -136,6 +140,7 @@ %patch15 -p0 -b .widechar.sidebar %patch16 -p0 -b .crlf %patch17 -p1 -b .cve.2014.0467 +%patch18 -p1 -b .mailcap cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -240,6 +245,7 @@ mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc +install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/mutt/mailcap %suse_update_desktop_file mutt #%fdupes %{buildroot} @@ -272,6 +278,7 @@ %{_mandir}/man5/muttrc.5.gz %{_mandir}/man5/mbox_mutt.5.gz %{_datadir}/mutt +%{_datadir}/mutt/mailcap %config(noreplace) %{_sysconfdir}/Muttrc %changelog ++ mutt-1.5.21-mailcap.diff ++ read /usr/share/mutt/mailcap as fallback by default. This allows to set some useful defaults specifically for mutt. For example text/html Index: mutt-1.5.21/init.c === --- mutt-1.5.21.orig/init.c +++ mutt-1.5.21/init.c @@ -3011,8 +3011,8 @@ void mutt_init (int skip_sys_rc, LIST *c MailcapPath = safe_strdup (p); else { -/* Default search path from RFC1524 */ -MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"); +/* Default search path from RFC1524 plus fallback for mutt specific defaults */ +MailcapPath = safe_strdup ("~/.mailcap:" PKGDATADIR "/mailcap:" SYSCONFDIR "/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap:" SYSCONFDIR "/mutt/mailcap"); } Tempdir = safe_strdup ((p = getenv ("TMPDIR")) ? p : "/tmp"); ++ mutt.mailcap ++ # render html mail with w3m text/html; w3m -I %{charset} -T text/html -dump %s; copiousoutput -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2014-03-26 16:41:27 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2013-08-06 07:03:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2014-03-26 16:41:28.0 +0100 @@ -1,0 +2,6 @@ +Mon Mar 17 13:24:35 UTC 2014 - meiss...@suse.com + +- mutt-CVE-2014-0467.patch: fixed a buffer overflow during header display. + CVE-2014-0467 / bnc#868115 + +--- New: mutt-CVE-2014-0467.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.RnJtwg/_old 2014-03-26 16:41:30.0 +0100 +++ /var/tmp/diff_new_pack.RnJtwg/_new 2014-03-26 16:41:30.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -101,6 +101,8 @@ Patch15:widechar.sidebar.dif # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF Patch16:mutt-1.5.21-cariage-return.path +# PATCH-FIX-SUSE: bnc#868115 - CVE-2014-0467: mutt: crash due to malicious email +Patch17:mutt-CVE-2014-0467.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -133,6 +135,7 @@ %patch14 -p1 -b .sidebar.color %patch15 -p0 -b .widechar.sidebar %patch16 -p0 -b .crlf +%patch17 -p1 -b .cve.2014.0467 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ mutt-CVE-2014-0467.patch ++ --- mutt-1.5.21/copy.c +++ mutt-1.5.21/copy.c 2014-03-25 08:42:27.466839319 + @@ -254,6 +254,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF { if (!address_header_decode (&this_one)) rfc2047_decode (&this_one); + this_one_len = mutt_strlen (this_one); } if (!headers[x]) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2013-08-06 07:03:01 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2013-06-05 13:31:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2013-08-06 07:03:02.0 +0200 @@ -1,0 +2,5 @@ +Mon Aug 5 18:06:01 CEST 2013 - r...@suse.de + +- BuildRequire libgcrpyt-devel instead of libgcrypt for > 12.3 + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.XviR8T/_old 2013-08-06 07:03:03.0 +0200 +++ /var/tmp/diff_new_pack.XviR8T/_new 2013-08-06 07:03:03.0 +0200 @@ -29,7 +29,11 @@ BuildRequires: ispell BuildRequires: krb5-devel BuildRequires: libcom_err +%if 0%{?suse_version} <= 1230 BuildRequires: libgcrypt +%else +BuildRequires: libgcrypt-devel +%endif BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libidn-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2013-06-05 13:31:13 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2013-04-23 17:21:50.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2013-06-05 13:31:14.0 +0200 @@ -1,0 +2,5 @@ +Wed May 29 10:26:45 UTC 2013 - wer...@suse.de + +- Enable mutt to parse e.g. PGP markers with CRLF + +--- New: mutt-1.5.21-cariage-return.path Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.Bu55OJ/_old 2013-06-05 13:31:15.0 +0200 +++ /var/tmp/diff_new_pack.Bu55OJ/_new 2013-06-05 13:31:15.0 +0200 @@ -30,13 +30,14 @@ BuildRequires: krb5-devel BuildRequires: libcom_err BuildRequires: libgcrypt +BuildRequires: libgnutls-devel BuildRequires: libgpg-error-devel BuildRequires: libidn-devel +BuildRequires: libopenssl-devel BuildRequires: libxml2 BuildRequires: libxslt BuildRequires: lynx BuildRequires: ncurses-devel -BuildRequires: openssl-devel BuildRequires: postfix BuildRequires: sgml-skel BuildRequires: update-desktop-files @@ -94,6 +95,8 @@ Patch14:nion.sidebar-color.diff # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler Patch15:widechar.sidebar.dif +# PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF +Patch16:mutt-1.5.21-cariage-return.path BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -125,6 +128,7 @@ %patch13 -p1 -b .automake-1.12 %patch14 -p1 -b .sidebar.color %patch15 -p0 -b .widechar.sidebar +%patch16 -p0 -b .crlf cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -189,6 +193,8 @@ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ --with-gss=%{_prefix} \ + --with-gnutls=%{_prefix} \ + --with-curses=%{_prefix} \ --with-regex \ --enable-smtp \ --enable-hcache \ ++ mutt-1.5.21-cariage-return.path ++ --- crypt-gpgme.c +++ crypt-gpgme.c 2013-05-29 09:31:53.141939173 + @@ -2003,12 +2003,12 @@ static int pgp_check_traditional_one_bod { if (!mutt_strncmp ("-BEGIN PGP ", buf, 15)) { - if (!mutt_strcmp ("MESSAGE-\n", buf + 15)) + if (!mutt_strxcmp ("MESSAGE-\n", buf + 15)) { enc = 1; break; } - else if (!mutt_strcmp ("SIGNED MESSAGE-\n", buf + 15)) + else if (!mutt_strxcmp ("SIGNED MESSAGE-\n", buf + 15)) { sgn = 1; break; @@ -2196,14 +2196,14 @@ int pgp_gpgme_application_handler (BODY clearsign = 0; start_pos = last_pos; - if (!mutt_strcmp ("MESSAGE-\n", buf + 15)) + if (!mutt_strxcmp ("MESSAGE-\n", buf + 15)) needpass = 1; - else if (!mutt_strcmp ("SIGNED MESSAGE-\n", buf + 15)) + else if (!mutt_strxcmp ("SIGNED MESSAGE-\n", buf + 15)) { clearsign = 1; needpass = 0; } - else if (!mutt_strcmp ("PUBLIC KEY BLOCK-\n", buf + 15)) + else if (!mutt_strxcmp ("PUBLIC KEY BLOCK-\n", buf + 15)) { needpass = 0; pgp_keyblock = 1; --- lib.c +++ lib.c 2013-05-29 09:31:53.325439198 + @@ -875,6 +875,18 @@ int mutt_strcmp(const char *a, const cha return strcmp(NONULL(a), NONULL(b)); } +int mutt_strxcmp(const char *a, const char *b) +{ + size_t xa, xb; + xa = strcspn(NONULL(a), "\r\n"); + xb = strcspn(NONULL(b), "\r\n"); + if (xb != xa) +return -1; + if (!xa) +return 0; + return strncmp(NONULL(a), NONULL(b), xa); +} + int mutt_strcasecmp(const char *a, const char *b) { return strcasecmp(NONULL(a), NONULL(b)); --- lib.h +++ lib.h 2013-05-29 09:25:21.805439324 + @@ -179,6 +179,7 @@ int mutt_copy_bytes (FILE *, FILE *, siz int mutt_rx_sanitize_string (char *, size_t, const char *); int mutt_strcasecmp (const char *, const char *); int mutt_strcmp (const char *, const char *); +int mutt_strxcmp (const char *, const char *); int mutt_strncasecmp (const char *, const char *, size_t); int mutt_strncmp (const char *, const char *, size_t); int mutt_strcoll (const char *, const char *); --- pager.c +++ pager.c 2013-05-29 09:31:53.433440090 + @@ -771,7 +771,7 @@ resolve_types (char *buf, char *raw, str else if (check_attachment_marker ((char *) raw) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; #endif - else i
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2013-04-23 17:21:48 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2013-01-14 22:24:10.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2013-04-23 17:21:50.0 +0200 @@ -1,0 +2,6 @@ +Thu Apr 18 12:54:39 UTC 2013 - wer...@suse.de + +- Add widechar.sidebar.dif as workaround: bnc#813498 - mutt crashes + in fgetwc in text_enriched_handler + +--- New: widechar.sidebar.dif Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.Uy9kGo/_old 2013-04-23 17:22:01.0 +0200 +++ /var/tmp/diff_new_pack.Uy9kGo/_new 2013-04-23 17:22:01.0 +0200 @@ -92,6 +92,8 @@ Patch12:patch-1.5.21.vk.pgp_verbose_mime Patch13:automake-1.12.patch Patch14:nion.sidebar-color.diff +# PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler +Patch15:widechar.sidebar.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -122,6 +124,7 @@ %patch12 -p1 -b .pgp_verbose_mtime %patch13 -p1 -b .automake-1.12 %patch14 -p1 -b .sidebar.color +%patch15 -p0 -b .widechar.sidebar cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -130,12 +133,42 @@ %if 0%{?suse_version} > 1100 autoreconf -fi %endif + cflags () + { +local flag=$1; shift +local var=$1; shift +test -n "${flag}" -a -n "${var}" || return +case "${!var}" in +*${flag}*) return +esac +set -o noclobber +case "$flag" in +-Wl,*) + if echo 'int main () { return 0; }' | \ + ${CC:-gcc} -Werror $flag -o /dev/null -xc - > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + ;; +*) + if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi +esac +set +o noclobber + } CC=gcc -CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" -CFLAGS="$CFLAGS -fstack-protector" -#CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL" +CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE" +#cflags -DSUSE_IMAP_FORCE_SSL CFLAGS +cflags -std=gnu99 CFLAGS +cflags -fno-strict-aliasingCFLAGS +cflags -fstack-protector CFLAGS +cflags -g3 CFLAGS +cflags -pipe CFLAGS +cflags -Wl,--as-needed LDFLAGS +cflags -Wl,-O2 LDFLAGS +cflags -Wl,--hash-size=8599LDFLAGS KRB5CFGPATH=%{S:6} -export CC CFLAGS KRB5CFGPATH +export CC CFLAGS LDFLAGS KRB5CFGPATH chmod 755 $KRB5CFGPATH ./configure $RPM_ARCH-suse-linux \ --prefix=%{_prefix} \ ++ widechar.sidebar.dif ++ --- handler.c +++ handler.c 2013-04-22 00:00:00.0 + @@ -778,7 +778,7 @@ static void enriched_set_flags (const wc static int text_enriched_handler (BODY *a, STATE *s) { enum { -TEXT, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE +TEXT, TEXT_GOTWC, LANGLE, TAG, BOGUS_TAG, NEWLINE, ST_EOF, DONE } state = TEXT; long bytes = a->length; @@ -807,7 +807,7 @@ static int text_enriched_handler (BODY * { if (state != ST_EOF) { - if (!bytes || (wc = fgetwc (s->fpin)) == WEOF) + if (state != TEXT_GOTWC && (!bytes || (fscanf (s->fpin, "%lc", &wc)) == EOF)) state = ST_EOF; else bytes--; @@ -815,6 +815,8 @@ static int text_enriched_handler (BODY * switch (state) { + case TEXT_GOTWC: + state = TEXT; case TEXT : switch (wc) { @@ -875,9 +877,8 @@ static int text_enriched_handler (BODY * enriched_flush (&stte, 1); else { - ungetwc (wc, s->fpin); bytes++; - state = TEXT; + state = TEXT_GOTWC; } break; @@ -1490,7 +1491,7 @@ void mutt_decode_attachment (BODY *b, ST * strip all trailing spaces to improve interoperability; * if $text_flowed is unset, simply verbatim copy input */ -static int text_plain_handler (BODY *b, STATE *s) +static int text_plain_handler (BODY *b __attribute__((unused)), STATE *s) { char *buf = NULL; size_t l = 0, sz = 0; @@ -1518,7 +1519,6 @@ int mutt_body_handler (BODY *b, STATE *s int decode = 0; int plaintext = 0; FILE *fp = NULL; - char tempfile[_POSIX_PATH_MAX]; handler_t handler = NULL; LOFF_T tmpoffset = 0; size_t tmplength = 0; @@ -15
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2013-01-14 22:24:09 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2012-12-21 14:54:07.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2013-01-14 22:24:10.0 +0100 @@ -1,0 +2,7 @@ +Mon Jan 14 09:11:05 UTC 2013 - wer...@suse.de + +- Remove spurious blank line from new patch to make older patch(1) + also work with this +- Make it build with older products + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.JSqJq1/_old 2013-01-14 22:24:11.0 +0100 +++ /var/tmp/diff_new_pack.JSqJq1/_new 2013-01-14 22:24:11.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,6 @@ #!BuildIgnore: sendmail BuildRequires: autoconf BuildRequires: automake -BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi BuildRequires: docbook-xsl-stylesheets @@ -82,7 +81,7 @@ Patch3: %name-1.5.20-sendgroupreplyto.diff Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 -# http://lunar-linux.org/index.php?page=mutt-sidebar +# http://lunar-linux.org/mutt-sidebar Patch6: mutt-1.5.21.sidebar.20120829.patch Patch7: mutt-1.5.21-opennfs.dif Patch8: mutt-1.5.20-gpgme_set_locale.patch @@ -128,7 +127,9 @@ cp %{S:2} . %build +%if 0%{?suse_version} > 1100 autoreconf -fi +%endif CC=gcc CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" CFLAGS="$CFLAGS -fstack-protector" @@ -145,7 +146,9 @@ --enable-imap \ --enable-pop \ --enable-pgp \ +%if 0%{?suse_version} >= 1100 --enable-gpgme \ +%endif --enable-nfs-fix \ --enable-mailtool \ --enable-compressed \ ++ mutt-1.5.21.sidebar.20120829.patch ++ 1285 lines (skipped) between /work/SRC/openSUSE:Factory/mutt/mutt-1.5.21.sidebar.20120829.patch and /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.5.21.sidebar.20120829.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2012-12-21 14:54:04 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2012-09-23 08:05:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2012-12-21 14:54:07.0 +0100 @@ -1,0 +2,5 @@ +Tue Dec 18 16:26:45 UTC 2012 - agin...@suse.com + +- update sidebar to version 20120829 + +--- Old: mutt-1.5.21.sidebar.20090619.patch New: mutt-1.5.21.sidebar.20120829.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.f6ib0M/_old 2012-12-21 14:54:09.0 +0100 +++ /var/tmp/diff_new_pack.f6ib0M/_new 2012-12-21 14:54:09.0 +0100 @@ -61,7 +61,7 @@ # desktop selections. #Requires:desktop-data-SuSE Version:1.5.21 -Release:0 +Release:33.2 Summary:Mail Program License:GPL-2.0+ Group: Productivity/Networking/Email/Clients @@ -83,7 +83,7 @@ Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 # http://lunar-linux.org/index.php?page=mutt-sidebar -Patch6: mutt-1.5.21.sidebar.20090619.patch +Patch6: mutt-1.5.21.sidebar.20120829.patch Patch7: mutt-1.5.21-opennfs.dif Patch8: mutt-1.5.20-gpgme_set_locale.patch Patch9: bug-676388-largefile.patch ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.f6ib0M/_old 2012-12-21 14:54:09.0 +0100 +++ /var/tmp/diff_new_pack.f6ib0M/_new 2012-12-21 14:54:09.0 +0100 @@ -6,7 +6,7 @@ +++ mutt-1.5.21/PATCHES2012-06-21 11:48:50.352837436 +0200 @@ -1,3 +1,4 @@ +patch-1.5.9.aw.listreply.1 - patch-1.5.20.sidebar.20090619.txt + patch-1.5.21.sidebar.20120829.txt patch-1.5.19.rr.compressed.1 patch-1.5.5.1.nt.xtitles.3.ab.1 Index: mutt-1.5.21/init.h ++ mutt-1.5.21.sidebar.20090619.patch -> mutt-1.5.21.sidebar.20120829.patch ++ 3878 lines (skipped) between /work/SRC/openSUSE:Factory/mutt/mutt-1.5.21.sidebar.20090619.patch and /work/SRC/openSUSE:Factory/.mutt.new/mutt-1.5.21.sidebar.20120829.patch ++ nion.sidebar-color.diff ++ --- /var/tmp/diff_new_pack.f6ib0M/_old 2012-12-21 14:54:09.0 +0100 +++ /var/tmp/diff_new_pack.f6ib0M/_new 2012-12-21 14:54:09.0 +0100 @@ -34,36 +34,39 @@ index 9e12319..4b37b76 100644 --- a/sidebar.c +++ b/sidebar.c -@@ -195,22 +195,26 @@ int draw_sidebar(int menu) { - } +@@ -250,13 +250,14 @@ + } - /* get attributes for divider */ -- SETCOLOR(MT_COLOR_STATUS); -+ SETCOLOR(MT_COLOR_SIDEBAR); + /* get attributes for divider */ +- SETCOLOR(MT_COLOR_STATUS); ++ SETCOLOR(MT_COLOR_SIDEBAR); #ifndef USE_SLANG_CURSES - attr_get(&attrs, &color_pair, 0); + attr_get(&attrs, &color_pair, 0); #else - color_pair = attr_get(); + color_pair = attr_get(); #endif -- SETCOLOR(MT_COLOR_NORMAL); + SETCOLOR(MT_COLOR_NORMAL); + /* SETCOLOR(MT_COLOR_SIDEBAR); */ - /* draw the divider */ + /* draw the divider */ - for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) { - move(lines, SidebarWidth - delim_len); --addstr(NONULL(SidebarDelim)); +@@ -266,10 +267,14 @@ + + for ( ; lines < SidebarHeight; lines++ ) { + move(lines, SidebarWidth - delim_len); +- addstr(NONULL(SidebarDelim)); -#ifndef USE_SLANG_CURSES --mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); +-mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); -#endif -+if (option (OPTASCIICHARS)) -+ addstr (NONULL (SidebarDelim)); -+else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|")) -+ addch (ACS_VLINE); -+else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|")) -+ addstr ("\342\224\202"); -+else -+ addstr (NONULL (SidebarDelim)); - } ++if (option (OPTASCIICHARS)) ++addstr (NONULL (SidebarDelim)); ++ else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|")) ++addch (ACS_VLINE); ++ else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|")) ++addstr ("\342\224\202"); ++ else ++ addstr (NONULL (SidebarDelim)); + } - if ( Incoming == 0 ) return 0; + if ( Incoming == 0 ) return 0; + -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2012-09-23 08:05:50 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2012-07-09 09:51:57.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2012-09-23 08:05:51.0 +0200 @@ -1,0 +2,5 @@ +Tue Sep 18 15:47:45 UTC 2012 - vmik...@suse.cz + +- Add back lost sidebar color patch. + +--- New: nion.sidebar-color.diff Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.WqROVp/_old 2012-09-23 08:05:54.0 +0200 +++ /var/tmp/diff_new_pack.WqROVp/_new 2012-09-23 08:05:54.0 +0200 @@ -92,6 +92,7 @@ Patch11:aw.listreply.diff Patch12:patch-1.5.21.vk.pgp_verbose_mime Patch13:automake-1.12.patch +Patch14:nion.sidebar-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -121,6 +122,7 @@ %patch11 -p1 -b .listreply %patch12 -p1 -b .pgp_verbose_mtime %patch13 -p1 -b .automake-1.12 +%patch14 -p1 -b .sidebar.color cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ nion.sidebar-color.diff ++ diff --git a/color.c b/color.c index bb6cbb4..bbf20a3 100644 --- a/color.c +++ b/color.c @@ -95,6 +95,7 @@ static struct mapping_t Fields[] = { "index", MT_COLOR_INDEX }, { "sidebar_new", MT_COLOR_NEW }, { "sidebar_flagged", MT_COLOR_FLAGGED }, + { "sidebar", MT_COLOR_SIDEBAR }, { NULL, 0 } }; @@ -144,6 +145,7 @@ void ci_start_color (void) /* set some defaults */ ColorDefs[MT_COLOR_STATUS] = A_REVERSE; + ColorDefs[MT_COLOR_SIDEBAR] = A_REVERSE; ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE; ColorDefs[MT_COLOR_SEARCH] = A_REVERSE; ColorDefs[MT_COLOR_MARKERS] = A_REVERSE; diff --git a/mutt_curses.h b/mutt_curses.h index 5f61048..cb1acf2 100644 --- a/mutt_curses.h +++ b/mutt_curses.h @@ -125,6 +125,7 @@ enum MT_COLOR_ATTACHMENT, MT_COLOR_SEARCH, MT_COLOR_BOLD, + MT_COLOR_SIDEBAR, MT_COLOR_UNDERLINE, MT_COLOR_INDEX, MT_COLOR_NEW, diff --git a/sidebar.c b/sidebar.c index 9e12319..4b37b76 100644 --- a/sidebar.c +++ b/sidebar.c @@ -195,22 +195,26 @@ int draw_sidebar(int menu) { } /* get attributes for divider */ - SETCOLOR(MT_COLOR_STATUS); + SETCOLOR(MT_COLOR_SIDEBAR); #ifndef USE_SLANG_CURSES attr_get(&attrs, &color_pair, 0); #else color_pair = attr_get(); #endif - SETCOLOR(MT_COLOR_NORMAL); + /* SETCOLOR(MT_COLOR_SIDEBAR); */ /* draw the divider */ for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) { move(lines, SidebarWidth - delim_len); -addstr(NONULL(SidebarDelim)); -#ifndef USE_SLANG_CURSES -mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); -#endif +if (option (OPTASCIICHARS)) + addstr (NONULL (SidebarDelim)); +else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|")) + addch (ACS_VLINE); +else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|")) + addstr ("\342\224\202"); +else + addstr (NONULL (SidebarDelim)); } if ( Incoming == 0 ) return 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2012-07-09 09:51:54 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2012-05-31 17:07:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2012-07-09 09:51:57.0 +0200 @@ -1,0 +2,5 @@ +Thu Jun 21 10:04:20 UTC 2012 - a...@cryptomilk.org + +- Update sidebar patch. + +--- Old: mutt-1.5.21.sidebar-fix.dif nion.sidebar-color.diff patch-1.5.21.sidebar-aa6aa.txt.bz2 New: mutt-1.5.21.sidebar.20090619.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.mOXTrI/_old 2012-07-09 09:51:59.0 +0200 +++ /var/tmp/diff_new_pack.mOXTrI/_new 2012-07-09 09:51:59.0 +0200 @@ -83,17 +83,15 @@ Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 # http://lunar-linux.org/index.php?page=mutt-sidebar -Patch6: patch-1.5.21.sidebar-aa6aa.txt.bz2 -Patch7: mutt-1.5.21.sidebar-fix.dif -Patch8: mutt-1.5.21-opennfs.dif -Patch9: mutt-1.5.20-gpgme_set_locale.patch -Patch10:bug-676388-largefile.patch -Patch11:nion.sidebar-color.diff -Patch12:mutt-1.5.21-tinfo.dif +Patch6: mutt-1.5.21.sidebar.20090619.patch +Patch7: mutt-1.5.21-opennfs.dif +Patch8: mutt-1.5.20-gpgme_set_locale.patch +Patch9: bug-676388-largefile.patch +Patch10:mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html -Patch13:aw.listreply.diff -Patch14:patch-1.5.21.vk.pgp_verbose_mime -Patch15:automake-1.12.patch +Patch11:aw.listreply.diff +Patch12:patch-1.5.21.vk.pgp_verbose_mime +Patch13:automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -110,21 +108,19 @@ patch -s -p1 < $p done %patch -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 -%patch4 -p0 -%patch5 -p1 -%patch6 -p1 -%patch7 -p0 -b .sidebar -%patch8 -p0 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -b .sidebar.color -%patch12 -p0 -b .tinfo -%patch13 -p1 -b .listreply -%patch14 -p1 -%patch15 -p1 +%patch1 -p1 -b .compressed +%patch2 -p0 -b .pgpewrap +%patch3 -p1 -b .sendgroupreplyto +%patch4 -p0 -b .wrapcolumn +%patch5 -p1 -b .xtitles +%patch6 -p1 -b .sidebar +%patch7 -p0 -b .opennfs +%patch8 -p1 -b .gpgme +%patch9 -p1 -b .largefile +%patch10 -p0 -b .tinfo +%patch11 -p1 -b .listreply +%patch12 -p1 -b .pgp_verbose_mtime +%patch13 -p1 -b .automake-1.12 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ aw.listreply.diff ++ --- /var/tmp/diff_new_pack.mOXTrI/_old 2012-07-09 09:51:59.0 +0200 +++ /var/tmp/diff_new_pack.mOXTrI/_new 2012-07-09 09:51:59.0 +0200 @@ -1,19 +1,19 @@ ask when sending list message replies to author only - Armin Wolfermann (aw) -diff --git a/PATCHES b/PATCHES -index cb66d17..e5bc9de 100644 a/PATCHES -+++ b/PATCHES +Index: mutt-1.5.21/PATCHES +=== +--- mutt-1.5.21.orig/PATCHES 2012-06-21 11:48:06.757181997 +0200 mutt-1.5.21/PATCHES2012-06-21 11:48:50.352837436 +0200 @@ -1,3 +1,4 @@ +patch-1.5.9.aw.listreply.1 - nion.sidebar-color - patch-1.5.19.sidebar.20090522.txt + patch-1.5.20.sidebar.20090619.txt patch-1.5.19.rr.compressed.1 -diff --git a/init.h b/init.h -index 82f3c7d..210d259 100644 a/init.h -+++ b/init.h -@@ -1329,6 +1329,13 @@ struct option_t MuttVars[] = { + patch-1.5.5.1.nt.xtitles.3.ab.1 +Index: mutt-1.5.21/init.h +=== +--- mutt-1.5.21.orig/init.h2012-06-21 11:48:06.754181952 +0200 mutt-1.5.21/init.h 2012-06-21 11:48:22.426417566 +0200 +@@ -1331,6 +1331,13 @@ struct option_t MuttVars[] = { ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. */ @@ -27,10 +27,10 @@ { "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 }, /* ** .pp -diff --git a/mutt.h b/mutt.h -index fd42004..ef78e11 100644 a/mutt.h -+++ b/mutt.h +Index: mutt-1.5.21/mutt.h +=== +--- mutt-1.5.21.orig/mutt.h2012-06-21 11:48:06.788182463 +0200 mutt-1.5.21/mutt.h 2012-06-21 11:48:22.426417566 +0200 @@ -290,6 +290,7 @@ enum #endif OPT_SUBJECT, @@ -39,11 +39,11 @@ /* THIS MUST BE THE LAST VALUE. */
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2012-05-31 17:07:20 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2011-12-02 16:25:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2012-05-31 17:07:28.0 +0200 @@ -1,0 +2,11 @@ +Tue May 29 14:10:05 UTC 2012 - pu...@suse.com + +- fix build with automake-1.12 + - add: automake-1.12.patch + +--- +Fri Apr 13 12:58:09 UTC 2012 - multiple1...@gmail.com + +- Added patch automatically add a filename and description to PGP/MIME attachments. + +--- @@ -372 +383 @@ - of Mr. Carsten H�ger + of Mr. Carsten Höger @@ -435 +446 @@ -- Include patch from Jo�l Riou which +- Include patch from Joël Riou which New: automake-1.12.patch patch-1.5.21.vk.pgp_verbose_mime Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.qVMuBY/_old 2012-05-31 17:07:30.0 +0200 +++ /var/tmp/diff_new_pack.qVMuBY/_new 2012-05-31 17:07:30.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package mutt # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: mutt #!BuildIgnore: sendmail +BuildRequires: autoconf +BuildRequires: automake BuildRequires: automake BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-gssapi @@ -46,8 +49,6 @@ %else BuildRequires: gpgme-devel %endif -License:GPL-2.0+ -Group: Productivity/Networking/Email/Clients Url:http://www.mutt.org Provides: muttssl Obsoletes: muttssl @@ -62,6 +63,8 @@ Version:1.5.21 Release:0 Summary:Mail Program +License:GPL-2.0+ +Group: Productivity/Networking/Email/Clients # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 Source1:Signature_conversion @@ -89,6 +92,8 @@ Patch12:mutt-1.5.21-tinfo.dif # http://www.wolfermann.org/mutt.html Patch13:aw.listreply.diff +Patch14:patch-1.5.21.vk.pgp_verbose_mime +Patch15:automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -118,6 +123,8 @@ %patch11 -p1 -b .sidebar.color %patch12 -p0 -b .tinfo %patch13 -p1 -b .listreply +%patch14 -p1 +%patch15 -p1 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -135,8 +142,8 @@ --prefix=%{_prefix} \ --datadir=%{_datadir} \ --sysconfdir=%{_sysconfdir} \ - --mandir=%_mandir \ - --with-docdir=%_defaultdocdir/%name \ + --mandir=%{_mandir} \ + --with-docdir=%{_docdir}/%name \ --enable-imap \ --enable-pop \ --enable-pgp \ @@ -159,34 +166,38 @@ make -C doc %install -make install DESTDIR=$RPM_BUILD_ROOT -mv Muttrc.SuSE $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc -install -m 755 %{S:1} $RPM_BUILD_ROOT%{_bindir} +make install DESTDIR=%{buildroot} +mv Muttrc.SuSE %{buildroot}%{_sysconfdir}/Muttrc +install -m 755 %{S:1} %{buildroot}%{_bindir} gzip -9 doc/manu*.txt rm -f contrib/Makefile* # datadir not automatically created: -mkdir -p $RPM_BUILD_ROOT%{_datadir}/mutt +mkdir -p %{buildroot}%{_datadir}/mutt +# INSTALL file should be removed: +rm -rf %{buildroot}%{_docdir}/%{name}/INSTALL # mbox/mmdf manual page conflicts with the one from tin, so rename it -mv $RPM_BUILD_ROOT%_mandir/man5/mbox.5 \ - $RPM_BUILD_ROOT%_mandir/man5/mbox_mutt.5 -mv $RPM_BUILD_ROOT%_mandir/man5/mmdf.5 \ - $RPM_BUILD_ROOT%_mandir/man5/mmdf_mutt.5 +mv %{buildroot}%{_mandir}/man5/mbox.5 \ + %{buildroot}%{_mandir}/man5/mbox_mutt.5 +mv %{buildroot}%{_mandir}/man5/mmdf.5 \ + %{buildroot}%{_mandir}/man5/mmdf_mutt.5 %find_lang %name # We get mime.types from aaa_base -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types +rm -f %{buildroot}%{_sysconfdir}/mime.types # Mutt BTS is gone -rm -f $RPM_BUILD_ROOT/%_mandir/man1/{flea*,muttbug*} -rm -f $RPM_BUILD_ROOT%{_bindir}/{flea,muttbug} -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.dist -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types.dist -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/ -mkdir -p
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2011-12-02 16:25:57 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2011-11-28 12:54:37.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2011-12-02 16:25:58.0 +0100 @@ -1,0 +2,5 @@ +Thu Dec 1 16:59:32 UTC 2011 - co...@suse.com + +- add automake as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.Co6m8D/_old 2011-12-02 16:26:04.0 +0100 +++ /var/tmp/diff_new_pack.Co6m8D/_new 2011-12-02 16:26:04.0 +0100 @@ -15,19 +15,38 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: mutt #!BuildIgnore: sendmail -BuildRequires: cyrus-sasl-devel cyrus-sasl-gssapi docbook-xsl-stylesheets docbook_4 gdbm-devel glibc-i18ndata 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 +BuildRequires: automake +BuildRequires: cyrus-sasl-devel +BuildRequires: cyrus-sasl-gssapi +BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook_4 +BuildRequires: gdbm-devel +BuildRequires: glibc-i18ndata +BuildRequires: ispell +BuildRequires: krb5-devel +BuildRequires: libcom_err +BuildRequires: libgcrypt +BuildRequires: libgpg-error-devel +BuildRequires: libidn-devel +BuildRequires: libxml2 +BuildRequires: libxslt +BuildRequires: lynx +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: postfix +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: xli #if %if 0%{?suse_version} > 1130 -BuildRequires: libassuan-devel libgpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libgpgme-devel %else BuildRequires: gpgme-devel %endif -License:GPLv2+ +License:GPL-2.0+ Group: Productivity/Networking/Email/Clients Url:http://www.mutt.org Provides: muttssl @@ -40,9 +59,8 @@ # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires:desktop-data-SuSE -AutoReqProv:on Version:1.5.21 -Release:22 +Release:0 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2011-11-28 12:54:35 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2011-11-23 19:37:01.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2011-11-28 12:54:37.0 +0100 @@ -1,0 +2,6 @@ +Thu Nov 24 00:44:07 UTC 2011 - vmik...@vmiklos.hu + +- Add patch to introduce a new (optional) check when + replying to messages originating from a mailing list + +--- New: aw.listreply.diff Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.40p6iu/_old 2011-11-28 12:54:38.0 +0100 +++ /var/tmp/diff_new_pack.40p6iu/_new 2011-11-28 12:54:38.0 +0100 @@ -42,7 +42,7 @@ #Requires:desktop-data-SuSE AutoReqProv:on Version:1.5.21 -Release:21 +Release:22 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 @@ -69,6 +69,8 @@ Patch10:bug-676388-largefile.patch Patch11:nion.sidebar-color.diff Patch12:mutt-1.5.21-tinfo.dif +# http://www.wolfermann.org/mutt.html +Patch13:aw.listreply.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -97,6 +99,7 @@ %patch10 -p1 %patch11 -p1 -b .sidebar.color %patch12 -p0 -b .tinfo +%patch13 -p1 -b .listreply cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ aw.listreply.diff ++ ask when sending list message replies to author only - Armin Wolfermann (aw) diff --git a/PATCHES b/PATCHES index cb66d17..e5bc9de 100644 --- a/PATCHES +++ b/PATCHES @@ -1,3 +1,4 @@ +patch-1.5.9.aw.listreply.1 nion.sidebar-color patch-1.5.19.sidebar.20090522.txt patch-1.5.19.rr.compressed.1 diff --git a/init.h b/init.h index 82f3c7d..210d259 100644 --- a/init.h +++ b/init.h @@ -1329,6 +1329,13 @@ struct option_t MuttVars[] = { ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP. */ + { "list_reply", DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO }, + /* + ** .pp + ** When set, address replies to the mailing list the original message came + ** from (instead to the author only). Setting this option to ``ask-yes'' or + ** ``ask-no'' will ask if you really intended to reply to the author only. + */ { "mail_check", DT_NUM, R_NONE, UL &BuffyTimeout, 5 }, /* ** .pp diff --git a/mutt.h b/mutt.h index fd42004..ef78e11 100644 --- a/mutt.h +++ b/mutt.h @@ -290,6 +290,7 @@ enum #endif OPT_SUBJECT, OPT_VERIFYSIG, /* verify PGP signatures */ + OPT_LISTREPLY, /* THIS MUST BE THE LAST VALUE. */ OPT_MAX diff --git a/send.c b/send.c index 047b2b4..d46327a 100644 --- a/send.c +++ b/send.c @@ -453,6 +453,7 @@ static int include_reply (CONTEXT *ctx, HEADER *cur, FILE *out) static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) { char prompt[STRING]; + ADDRESS *tmp; if (flags && env->mail_followup_to && hmfupto == M_YES) { @@ -466,6 +467,23 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int flags, int hmfupto) if (flags & SENDLISTREPLY) return 0; + /* If this message came from a mailing list, ask the user if he really + * intended to reply to the author only. + */ + if (!(flags & SENDGROUPREPLY) && mutt_is_list_cc (0, env->to, env->cc)) { +switch (query_quadoption (OPT_LISTREPLY, +_("Message came from a mailing list. Reply to author only?"))) +{ +case M_NO: + tmp = find_mailing_lists (env->to, env->cc); + rfc822_append (to, tmp, 0); + rfc822_free_address (&tmp); + return 0; +case -1: + return -1; /* abort */ +} + } + if (!option(OPTREPLYSELF) && mutt_addr_is_user (env->from)) { /* mail is from the user, assume replying to recipients */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2011-11-23 19:36:59 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2011-11-05 11:49:53.0 +0100 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2011-11-23 19:37:01.0 +0100 @@ -1,0 +2,5 @@ +Tue Nov 22 12:58:28 UTC 2011 - wer...@suse.de + +- Add patch to use libtinfo if available + +--- New: mutt-1.5.21-tinfo.dif Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.5P6a9v/_old 2011-11-23 19:37:03.0 +0100 +++ /var/tmp/diff_new_pack.5P6a9v/_new 2011-11-23 19:37:03.0 +0100 @@ -68,6 +68,7 @@ Patch9: mutt-1.5.20-gpgme_set_locale.patch Patch10:bug-676388-largefile.patch Patch11:nion.sidebar-color.diff +Patch12:mutt-1.5.21-tinfo.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -95,6 +96,7 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 -b .sidebar.color +%patch12 -p0 -b .tinfo cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ mutt-1.5.21-tinfo.dif ++ --- configure.ac +++ configure.ac2011-11-22 12:48:52.319147493 + @@ -274,9 +274,14 @@ main () do AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) done + cf_tinfo="" + AC_CHECK_LIB(tinfo, tgetent, [cf_tinfo="tinfo"]) AC_CHECK_LIB($cf_ncurses, initscr, -[MUTTLIBS="$MUTTLIBS -l$cf_ncurses" - +[if test x$cf_tinfo = x ; then + MUTTLIBS="$MUTTLIBS -l$cf_ncurses" + else + MUTTLIBS="$MUTTLIBS -l$cf_ncurses -l$cf_tinfo" + fi if test "$cf_ncurses" = ncursesw; then AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"]) else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2011-11-05 11:21:00 Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) Package is "mutt", Maintainer is "wer...@suse.com" Changes: --- /work/SRC/openSUSE:Factory/mutt/mutt.changes2011-09-23 02:13:39.0 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2011-11-05 11:49:53.0 +0100 @@ -1,0 +2,5 @@ +Tue Oct 25 22:17:13 CEST 2011 - vmik...@vmiklos.hu + +- Add patch to be able to specify the color of the sidebar + +--- New: nion.sidebar-color.diff Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.dUjFvi/_old 2011-11-05 11:53:32.0 +0100 +++ /var/tmp/diff_new_pack.dUjFvi/_new 2011-11-05 11:53:32.0 +0100 @@ -42,7 +42,7 @@ #Requires:desktop-data-SuSE AutoReqProv:on Version:1.5.21 -Release:20 +Release:21 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 @@ -67,6 +67,7 @@ Patch8: mutt-1.5.21-opennfs.dif Patch9: mutt-1.5.20-gpgme_set_locale.patch Patch10:bug-676388-largefile.patch +Patch11:nion.sidebar-color.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -93,6 +94,7 @@ %patch8 -p0 %patch9 -p1 %patch10 -p1 +%patch11 -p1 -b .sidebar.color cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ nion.sidebar-color.diff ++ diff -r 97d8bf4c46f9 PATCHES --- a/PATCHES Mon Jun 29 17:52:30 2009 +0200 +++ b/PATCHES Mon Jun 29 17:54:21 2009 +0200 @@ -1,3 +1,4 @@ +nion.sidebar-color patch-1.5.19.sidebar.20090522.txt patch-1.5.19.rr.compressed.1 patch-1.5.5.1.nt.xtitles.3.ab.1 diff -r 97d8bf4c46f9 color.c --- a/color.c Mon Jun 29 17:52:30 2009 +0200 +++ b/color.c Mon Jun 29 17:54:21 2009 +0200 @@ -95,6 +95,7 @@ { "index", MT_COLOR_INDEX }, { "sidebar_new", MT_COLOR_NEW }, { "sidebar_flagged", MT_COLOR_FLAGGED }, + { "sidebar", MT_COLOR_SIDEBAR }, { NULL, 0 } }; @@ -144,6 +145,7 @@ /* set some defaults */ ColorDefs[MT_COLOR_STATUS] = A_REVERSE; + ColorDefs[MT_COLOR_SIDEBAR] = A_REVERSE; ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE; ColorDefs[MT_COLOR_SEARCH] = A_REVERSE; ColorDefs[MT_COLOR_MARKERS] = A_REVERSE; diff -r 97d8bf4c46f9 mutt_curses.h --- a/mutt_curses.h Mon Jun 29 17:52:30 2009 +0200 +++ b/mutt_curses.h Mon Jun 29 17:54:21 2009 +0200 @@ -125,6 +125,7 @@ MT_COLOR_ATTACHMENT, MT_COLOR_SEARCH, MT_COLOR_BOLD, + MT_COLOR_SIDEBAR, MT_COLOR_UNDERLINE, MT_COLOR_INDEX, MT_COLOR_NEW, diff -r 97d8bf4c46f9 sidebar.c --- a/sidebar.c Mon Jun 29 17:52:30 2009 +0200 +++ b/sidebar.c Mon Jun 29 17:54:21 2009 +0200 @@ -196,22 +196,26 @@ } /* get attributes for divider */ - SETCOLOR(MT_COLOR_STATUS); + SETCOLOR(MT_COLOR_SIDEBAR); #ifndef USE_SLANG_CURSES attr_get(&attrs, &color_pair, 0); #else color_pair = attr_get(); #endif - SETCOLOR(MT_COLOR_NORMAL); + /* SETCOLOR(MT_COLOR_SIDEBAR); */ /* draw the divider */ for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) { move(lines, SidebarWidth - delim_len); - addstr(NONULL(SidebarDelim)); -#ifndef USE_SLANG_CURSES -mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL); -#endif + if (option (OPTASCIICHARS)) + addstr (NONULL (SidebarDelim)); + else if (!option (OPTASCIICHARS) && !strcmp (NONULL(SidebarDelim), "|")) + addch (ACS_VLINE); + else if ((Charset_is_utf8) && !strcmp (NONULL(SidebarDelim), "|")) + addstr ("\342\224\202"); + else + addstr (NONULL (SidebarDelim)); } if ( Incoming == 0 ) return 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Thu Jul 7 15:45:04 CEST 2011. --- mutt/mutt.changes 2011-06-20 15:25:41.0 +0200 +++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2011-07-07 13:27:54.0 +0200 @@ -1,0 +2,6 @@ +Thu Jul 7 11:26:18 UTC 2011 - wer...@suse.de + +- Update patch for Mutt Ticket #3288 and check for empty headers + in mx_update_context() (bnx#704359) + +--- calling whatdependson for head-i586 Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.twHfPQ/_old 2011-07-07 15:40:49.0 +0200 +++ /var/tmp/diff_new_pack.twHfPQ/_new 2011-07-07 15:40:49.0 +0200 @@ -42,7 +42,7 @@ #Requires:desktop-data-SuSE AutoReqProv:on Version:1.5.21 -Release:18 +Release:20 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 ++ mutt-1.5.21-patches.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch new/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch --- old/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch 2011-06-20 14:11:41.0 +0200 +++ new/mutt-1.5.21-patches/3288-mx_update_context-segfault.patch 2011-07-07 13:21:51.0 +0200 @@ -8,7 +8,7 @@ --- a/imap/message.c +++ b/imap/message.c -@@ -65,7 +65,7 @@ +@@ -65,7 +65,7 @@ int imap_read_headers (IMAP_DATA* idata, char *hdrreq = NULL; FILE *fp; char tempfile[_POSIX_PATH_MAX]; @@ -17,7 +17,7 @@ IMAP_HEADER h; IMAP_STATUS* status; int rc, mfhrc, oldmsgcount; -@@ -185,7 +185,7 @@ +@@ -185,7 +185,7 @@ int imap_read_headers (IMAP_DATA* idata, continue; } @@ -26,7 +26,15 @@ ctx->hdrs[idx] = imap_hcache_get (idata, h.data->uid); if (ctx->hdrs[idx]) { -@@ -282,13 +282,14 @@ +@@ -211,6 +211,7 @@ int imap_read_headers (IMAP_DATA* idata, + dprint (3, (debugfile, "bad cache entry at %d, giving up\n", h.sid - 1)); + imap_free_header_data((void**) (void*) &h.data); + evalhc = 0; ++ idx--; + } + } + while (rc != IMAP_CMD_OK && mfhrc == -1); +@@ -273,18 +274,20 @@ int imap_read_headers (IMAP_DATA* idata, { dprint (2, (debugfile, "msg_fetch_header: ignoring fetch response with no body\n")); mfhrc = -1; @@ -42,3 +50,17 @@ if (idx > msgend) { dprint (1, (debugfile, "imap_read_headers: skipping FETCH response for " + "unknown message number %d\n", h.sid)); + mfhrc = -1; ++idx--; + continue; + } + /* May receive FLAGS updates in a separate untagged response (#2935) */ +@@ -292,6 +295,7 @@ int imap_read_headers (IMAP_DATA* idata, + { + dprint (2, (debugfile, "imap_read_headers: message %d is not new\n", + h.sid)); ++idx--; + continue; + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mutt-1.5.21-patches/3459-split-fetches.patch new/mutt-1.5.21-patches/3459-split-fetches.patch --- old/mutt-1.5.21-patches/3459-split-fetches.patch2011-06-20 14:12:15.0 +0200 +++ new/mutt-1.5.21-patches/3459-split-fetches.patch2011-07-07 13:23:06.0 +0200 @@ -3,7 +3,7 @@ --- a/imap/message.c +++ b/imap/message.c -@@ -242,6 +242,15 @@ +@@ -243,6 +243,15 @@ int imap_read_headers (IMAP_DATA* idata, char *cmd; fetchlast = msgend + 1; ++ mutt-1.5.21.dif ++ --- /var/tmp/diff_new_pack.twHfPQ/_old 2011-07-07 15:40:49.0 +0200 +++ /var/tmp/diff_new_pack.twHfPQ/_new 2011-07-07 15:40:49.0 +0200 @@ -296,3 +296,15 @@ { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, /* ** .pp +--- mx.c mx.c 2011-07-07 11:24:48.680426606 + +@@ -1591,6 +1591,9 @@ void mx_update_context (CONTEXT *ctx, in + { + h = ctx->hdrs[msgno]; + ++if (!h) ++ continue; ++ + if (WithCrypto) + { + /* NOTE: this _must_ be done before the check for mailcap! */ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Mon Jun 20 16:01:21 CEST 2011. --- mutt/mutt.changes 2011-04-15 14:17:37.0 +0200 +++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2011-06-20 15:25:41.0 +0200 @@ -1,0 +2,28 @@ +Mon Jun 20 15:11:39 CEST 2011 - wer...@suse.de + +- Add patches for the following Mutt Tickets: + #1771: pipe-mime + #2179: score-match + #3240: imapuser + #3261: readonly-open + #3288: mx_update_context-segfault + #3293: dont-recode-saved-attachments + #3300: gpgme-1.2 + #3324: smimekeys-tmpdir + #3326: emptycharset + #3335: thread-segfault + #3339: smime_keys-chaining + #3371: ansi-escape-segfault + #3378: references + #3457: pop3-segfault + #3459: split-fetches + #3483: header-strchr + #3496: no-implicit_autoview-for-text-html + #3506: gnutls-CN-validation + #3515: gnutls-deprecated-set-priority + #3516: gnutls-deprecated-verify-peers + with ticket #3506 bnc#700648 becomes fixed, with ticket #3496 + the autoview regression for text/html should be fixed. +- Add one line more for sidebar if displayed on top + +--- calling whatdependson for head-i586 New: mutt-1.5.21-patches.tar.bz2 Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.6tKz5Y/_old 2011-06-20 16:00:39.0 +0200 +++ /var/tmp/diff_new_pack.6tKz5Y/_new 2011-06-20 16:00:39.0 +0200 @@ -42,7 +42,7 @@ #Requires:desktop-data-SuSE AutoReqProv:on Version:1.5.21 -Release:16 +Release:18 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 @@ -53,6 +53,7 @@ Source5:skel.muttrc Source6:krb5-config Source7:mutt-1.5.21.de.po +Source8:%name-%version-patches.tar.bz2 Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ Patch1: patch-%version.rr.compressed.1.bz2 @@ -75,7 +76,12 @@ however. %prep -%setup -q -n mutt-%version +%setup -q -n mutt-%version -b 8 +for p in ../%name-%version-patches/*; do +test -e $p || break +echo Patch $p +patch -s -p1 < $p +done %patch %patch1 -p1 %patch2 -p0 @@ -83,7 +89,7 @@ %patch4 -p0 %patch5 -p1 %patch6 -p1 -%patch7 -p0 +%patch7 -p0 -b .sidebar %patch8 -p0 %patch9 -p1 %patch10 -p1 ++ mutt-1.5.21.sidebar-fix.dif ++ --- /var/tmp/diff_new_pack.6tKz5Y/_old 2011-06-20 16:00:39.0 +0200 +++ /var/tmp/diff_new_pack.6tKz5Y/_new 2011-06-20 16:00:39.0 +0200 @@ -64,7 +64,7 @@ BuffyCount++; break; --- sidebar.c -+++ sidebar.c 2011-01-31 12:06:41.571925769 + sidebar.c 2011-06-20 12:30:59.803926815 + @@ -28,6 +28,7 @@ #include "sidebar.h" #include "buffy.h" @@ -130,13 +130,15 @@ } return entry; } -@@ -136,15 +146,17 @@ void set_curbuffy(char buf[LONG_STRING]) +@@ -136,6 +146,7 @@ void set_curbuffy(char buf[LONG_STRING]) int draw_sidebar(int menu) { + char folder_buffer[LINE_MAX]; int lines = option(OPTHELP) ? 1 : 0; - BUFFY *tmp; + lines += option(OPTSTATUSONTOP) ? 1 : 0; + +@@ -143,10 +154,11 @@ int draw_sidebar(int menu) { #ifndef USE_SLANG_CURSES attr_t attrs; #endif @@ -150,7 +152,7 @@ static int prev_show_value; static short saveSidebarWidth; -@@ -168,7 +180,7 @@ int draw_sidebar(int menu) { +@@ -170,7 +182,7 @@ int draw_sidebar(int menu) { } @@ -159,7 +161,7 @@ if (SidebarWidth > 0 && option (OPTSIDEBAR) && delim_len >= SidebarWidth) { unset_option (OPTSIDEBAR); -@@ -226,6 +238,32 @@ int draw_sidebar(int menu) { +@@ -229,6 +241,32 @@ int draw_sidebar(int menu) { SETCOLOR(MT_COLOR_NORMAL); for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) { @@ -192,7 +194,7 @@ if ( tmp == CurBuffy ) SETCOLOR(MT_COLOR_INDICATOR); else if ( tmp->msg_unread > 0 ) -@@ -241,35 +279,36 @@ int draw_sidebar(int menu) { +@@ -244,35 +282,36 @@ int draw_sidebar(int menu) { tmp->msgcount = Context->msgcount; tmp->msg_flagged = Context->flagged; } ++ patch-1.5.21.sidebar-aa6aa.txt.bz2 ++ --- /var/tmp/diff_new_pack.6tKz5Y/_old 2011-06-20 16:00:40.0 +0200 +++ /var/tmp/diff_new_pack.6tKz5Y/_new 2011-06-20 16:00:40.0 +0200 @@ -959,7 +959,7 @@ break; --- mutt-1.5.21/sidebar.c +++ mutt-1.5.21/sidebar.c 2010-09-04 20:32:59.0 + -@@ -0,0 +1,333 @@ +@@ -0,0 +1,336 @@ +/* + * Copyright (C) -2004 Justin Hibbits + * Copyright (C) 2004 Thomer M. Gil @@ -1099,6 +1099,8 @@ +int draw_sidebar(int menu) {
commit mutt for openSUSE:Factory
Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Fri Apr 15 20:16:23 CEST 2011. --- mutt/mutt.changes 2011-02-03 11:37:47.0 +0100 +++ mutt/mutt.changes 2011-04-15 14:17:37.0 +0200 @@ -1,0 +2,5 @@ +Fri Apr 15 14:15:02 CEST 2011 - wer...@suse.de + +- Support offsets in 2gig mbox files even on 32bit architectures (bnc#676388) + +--- calling whatdependson for head-i586 New: bug-676388-largefile.patch Other differences: -- ++ mutt.spec ++ --- /var/tmp/diff_new_pack.cfF9e0/_old 2011-04-15 20:14:16.0 +0200 +++ /var/tmp/diff_new_pack.cfF9e0/_new 2011-04-15 20:14:16.0 +0200 @@ -42,7 +42,7 @@ #Requires:desktop-data-SuSE AutoReqProv:on Version:1.5.21 -Release:3 +Release:16 Summary:Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0:%name-%version.tar.bz2 @@ -65,6 +65,7 @@ Patch7: mutt-1.5.21.sidebar-fix.dif Patch8: mutt-1.5.21-opennfs.dif Patch9: mutt-1.5.20-gpgme_set_locale.patch +Patch10:bug-676388-largefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -85,6 +86,7 @@ %patch7 -p0 %patch8 -p0 %patch9 -p1 +%patch10 -p1 cp doc/Muttrc Muttrc.SuSE cp %{S:2} . ++ bug-676388-largefile.patch ++ diff -ur orig.010003/mutt-1.5.21/crypt-gpgme.c mutt-1.5.21/crypt-gpgme.c --- orig.010003/mutt-1.5.21/crypt-gpgme.c 2010-09-13 19:19:55.0 +0200 +++ mutt-1.5.21/crypt-gpgme.c 2011-03-02 18:18:01.0 +0100 @@ -461,7 +461,7 @@ /* Create a GPGME data object from the stream FP but limit the object to LENGTH bytes starting at OFFSET bytes from the beginning of the file. */ -static gpgme_data_t file_to_data_object (FILE *fp, long offset, long length) +static gpgme_data_t file_to_data_object (FILE *fp, LOFF_T offset, long length) { int err = 0; gpgme_data_t data; @@ -2156,7 +2156,7 @@ { int needpass = -1, pgp_keyblock = 0; int clearsign = 0; - long start_pos = 0; + LOFF_T start_pos = 0; long bytes; LOFF_T last_pos, offset; char buf[HUGE_STRING]; diff -ur orig.010003/mutt-1.5.21/handler.c mutt-1.5.21/handler.c --- orig.010003/mutt-1.5.21/handler.c 2009-08-25 21:08:52.0 +0200 +++ mutt-1.5.21/handler.c 2011-03-02 18:12:28.0 +0100 @@ -1520,7 +1520,7 @@ FILE *fp = NULL; char tempfile[_POSIX_PATH_MAX]; handler_t handler = NULL; - long tmpoffset = 0; + LOFF_T tmpoffset = 0; size_t tmplength = 0; char type[STRING]; int rc = 0; diff -ur orig.010003/mutt-1.5.21/mh.c mutt-1.5.21/mh.c --- orig.010003/mutt-1.5.21/mh.c2010-08-24 18:34:21.0 +0200 +++ mutt-1.5.21/mh.c2011-03-02 18:48:36.0 +0100 @@ -1493,9 +1493,9 @@ char newpath[_POSIX_PATH_MAX]; char partpath[_POSIX_PATH_MAX]; - long old_body_offset = h->content->offset; - long old_body_length = h->content->length; - long old_hdr_lines = h->lines; + LOFF_T old_body_offset = h->content->offset; + LOFF_T old_body_length = h->content->length; + LOFF_T old_hdr_lines = h->lines; if ((dest = mx_open_new_message (ctx, h, 0)) == NULL) return -1; diff -ur orig.010003/mutt-1.5.21/mutt.h mutt-1.5.21/mutt.h --- orig.010003/mutt-1.5.21/mutt.h 2010-09-13 19:19:55.0 +0200 +++ mutt-1.5.21/mutt.h 2011-03-02 17:52:03.0 +0100 @@ -625,7 +625,7 @@ PARAMETER *parameter; /* parameters of the content-type */ char *description;/* content-description */ char *form_name; /* Content-Disposition form-data name param */ - long hdr_offset; /* offset in stream where the headers begin. + LOFF_T hdr_offset; /* offset in stream where the headers begin. * this info is used when invoking metamail, * where we need to send the headers of the * attachment diff -ur orig.010003/mutt-1.5.21/pgp.c mutt-1.5.21/pgp.c --- orig.010003/mutt-1.5.21/pgp.c 2010-09-13 19:19:55.0 +0200 +++ mutt-1.5.21/pgp.c 2011-03-02 18:48:08.0 +0100 @@ -251,7 +251,7 @@ int needpass = -1, pgp_keyblock = 0; int clearsign = 0, rv, rc; int c = 1; /* silence GCC warning */ - long start_pos = 0; + LOFF_T start_pos = 0; long bytes; LOFF_T last_pos, offset; char buf[HUGE_STRING]; diff -ur orig.010003/mutt-1.5.21/smime.c mutt-1.5.21/smime.c --- orig.010003/mutt-1.5.21/smime.c 2010-09-13 19:19:55.0 +0200 +++ mutt-1.5.21/smime.c 2011-03-02 18:12:08.0 +0100 @@ -1546,7 +1546,7 @@ pid_t thepid; int badsig = -1; - long tmpoffset = 0; + LOFF_T tmpoffset = 0; size_t tmplength = 0; int origType = sigbdy->type; char *savePrefix = NULL; @@