Fix segfaults with ssh tunnels, patch 228671-pipe-mime.patch updated. Thanks Nikolaus...

[software/mutt-debian.git] / debian / patches / debian-specific / Muttrc

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 7f3a8b084f376791535a2abfecdb26aa6f2155c7..fd0a798a117b9a9e0b45becbd3ce6400d5900a6e 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -1,16 +1,14 @@
-Index: debian-mutt/Muttrc.head
-===================================================================
---- debian-mutt.orig/Muttrc.head       2007-06-08 13:19:22.000000000 +0200
-+++ debian-mutt/Muttrc.head    2007-06-08 13:20:36.000000000 +0200
-@@ -6,6 +6,36 @@
- #
- ignore "from " received content- mime-version status x-status message-id
- ignore sender references return-path lines
-+ignore date delivered-to precedence errors-to in-reply-to user-agent
-+ignore x-loop x-sender x-mailer x-msmail-priority x-mimeole x-ms- x-priority
-+ignore x-accept-language x-authentication-warning thread- priority importance
-+ignore x-original-to domainkey-signature dkim-signature
-+
+# vim:ft=diff
+
+ * 2009-01-15 myon: refreshed for mutt-1.5.19; drop our list of ignored headers
+   in favor of upstream's new unignore list
+
+--- a/doc/Muttrc.head
++++ b/doc/Muttrc.head
+@@ -12,6 +12,34 @@
+ # Display the fields in this order
+ hdr_order date from to cc subject
+ 

 +# emacs-like bindings
 +bind editor    "\e<delete>"    kill-word
 +bind editor    "\e<backspace>" kill-word
 +# emacs-like bindings
 +bind editor    "\e<delete>"    kill-word
 +bind editor    "\e<backspace>" kill-word


@@ -26,8 +24,10 @@ Index: debian-mutt/Muttrc.head
 +# Specifies how to sort messages in the index menu.
 +set sort=threads
 +
 +# Specifies how to sort messages in the index menu.
 +set sort=threads
 +

-+# Uncomment if your MTA does not strip Bcc: headers.
-+# (exim4 and postfix strip them, exim(3) does not.)
++# The behavior of this option on the Debian mutt package is
++# not the original one because exim4, the default SMTP on Debian
++# does not strip bcc headers so this can cause privacy problems;
++# see man muttrc for more info

 +#unset write_bcc
 +# Postfix and qmail use Delivered-To for detecting loops
 +unset bounce_delivered
 +#unset write_bcc
 +# Postfix and qmail use Delivered-To for detecting loops
 +unset bounce_delivered


@@ -36,10 +36,11 @@ Index: debian-mutt/Muttrc.head
 +
 +# System-wide CA file managed by the ca-certificates package
 +set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"
 +
 +# System-wide CA file managed by the ca-certificates package
 +set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt"

- 
++

  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"

-@@ -18,14 +48,14 @@ macro index,pager,attach,compose \cb "\
+ 
+@@ -23,7 +51,7 @@

  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1


@@ -48,7 +49,8 @@ Index: debian-mutt/Muttrc.head
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"

- bind browser y exit
+@@ -35,7 +63,7 @@
+ # append-hook \\.gz$ "gzip -c %t >> %f"

  
  # If Mutt is unable to determine your site's domain name correctly, you can
 -# set the default here.
  
  # If Mutt is unable to determine your site's domain name correctly, you can
 -# set the default here.


@@ -56,7 +58,18 @@ Index: debian-mutt/Muttrc.head
  #
  # set hostname=cs.hmc.edu
  
  #
  # set hostname=cs.hmc.edu
  

-@@ -87,6 +117,9 @@ attachments   +I text/plain
+@@ -47,6 +75,10 @@
+ # be undone with unmime_lookup.
+ mime_lookup application/octet-stream
+ 
++# Upgrade the progress counter every 250ms, good for mutt over SSH
++# see http://bugs.debian.org/537746
++set time_inc=250
++
+ ##
+ ## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
+ ##
+@@ -101,6 +133,9 @@

  attachments   -A message/external-body
  attachments   -I message/external-body
  
  attachments   -A message/external-body
  attachments   -I message/external-body