upstream/544794-smtp-batch.patch: mutt won't ask for a password if smtp_user and...

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

diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults
index 372695316ca20d4a1a9594b767847e6170c7add5..7240bef2de08690ca71e289676daf4b61d7fb84a 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,28 +1,31 @@
-Index: debian-mutt/init.h
+Some customization of the option which are straying from the default
+only on Debian systems
+
+Index: mutt/init.h

 ===================================================================
 ===================================================================

---- debian-mutt.orig/init.h    2007-03-21 21:58:13.000000000 +0100
-+++ debian-mutt/init.h 2007-03-21 22:10:38.000000000 +0100
-@@ -289,6 +289,9 @@ struct option_t MuttVars[] = {
+--- mutt.orig/init.h   2009-06-25 12:36:35.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:36.000000000 +0200
+@@ -312,6 +312,9 @@

    ** .pp
    ** .pp

-   ** When this variable is set, mutt will include Delivered-To headers when
-   ** bouncing messages.  Postfix users may wish to unset this variable.
+   ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
+   ** bouncing messages.  Postfix users may wish to \fIunset\fP this variable.

 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this option is unset by default in
 +  ** /etc/Muttrc.
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this option is unset by default in
 +  ** /etc/Muttrc.
    */
    { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
    /*

-@@ -798,6 +801,9 @@ struct option_t MuttVars[] = {
-   ** Specifies the hostname to use after the ``@'' in local e-mail
-   ** addresses.  This overrides the compile time definition obtained from
-   ** /etc/resolv.conf.
+@@ -1032,6 +1035,9 @@
+   ** one is not used.
+   ** .pp
+   ** Also see $$use_domain and $$hidden_host.

 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, the default for this variable is obtained
 +  ** from /etc/mailname when Mutt starts.
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, the default for this variable is obtained
 +  ** from /etc/mailname when Mutt starts.
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*

-@@ -1301,6 +1307,9 @@ struct option_t MuttVars[] = {
+@@ -1554,6 +1560,9 @@

    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.


@@ -31,24 +34,45 @@ Index: debian-mutt/init.h
 +  ** ``mixmaster-filter'' in /etc/Muttrc.
    */
  #endif
 +  ** ``mixmaster-filter'' in /etc/Muttrc.
    */
  #endif

- 
-@@ -2626,6 +2635,9 @@ struct option_t MuttVars[] = {
+   { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
+@@ -2570,6 +2579,10 @@
+   ** This variable contains the name of either a directory, or a file which
+   ** contains trusted certificates for use with OpenSSL.
+   ** (S/MIME only)
++  ** .pp
++  ** \fBNote:\fP On Debian systems, this defaults to the first existing file in
++  ** the following list: ~/.smime/ca-certificates.crt ~/.smime/ca-bundle.crt
++  ** /etc/ssl/certs/ca-certificates.crt.
+   */
+   { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
+   /*
+@@ -2776,6 +2789,9 @@
+   ** .ts
+   ** set smtp_authenticators="digest-md5:cram-md5"
+   ** .te
++  ** .pp
++  ** \fBNote:\fP On Debian systems, this variable defaults to the example
++  ** mentioned. This file is managed by the ``ca-certificates'' package.
+   */
+ # endif /* USE_SASL */
+   { "smtp_pass",      DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
+@@ -2823,6 +2839,9 @@

    ** .pp
    ** .pp

-   ** You may optionally use the reverse- prefix to specify reverse sorting
-   ** order (example: set sort=reverse-date-sent).
+   ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
+   ** order (example: ``\fCset sort=reverse-date-sent\fP'').

 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this option is set by default to
 +  ** ``threads'' in /etc/Muttrc.
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this option is set by default to
 +  ** ``threads'' in /etc/Muttrc.
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*

-@@ -3022,6 +3034,9 @@ struct option_t MuttVars[] = {
-   ** is set to deliver directly via SMTP (see ``$$smtp_url''), this
-   ** option does nothing: mutt will never write out the BCC header
+@@ -3348,6 +3367,9 @@
+   ** is set to deliver directly via SMTP (see $$smtp_url), this
+   ** option does nothing: mutt will never write out the ``Bcc:'' header

    ** in this case.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
 +  ** default. The above warning applies to exim3 users, see /etc/Muttrc.
    */
    ** in this case.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
 +  ** default. The above warning applies to exim3 users, see /etc/Muttrc.
    */

-   {"xterm_icon",       DT_STR,   R_BOTH, UL &XtermIcon,  UL "M%?n?AIL&ail?"},
+   { "write_inc",      DT_NUM,  R_NONE, UL &WriteInc, 10 },

    /*
    /*