New upstream version.

* New upstream version.
  + Header weeding changed in default config; now we ignore * and unignore
    from: subject to cc date x-mailer x-url user-agent. (Mutt: #286)
  + $move now defaults to "no" instead of "ask-no".

diff --git a/debian/changelog b/debian/changelog
index e35deff2ea5fe0245c7a06fce9a5eba5987fd1b4..288d2be12aab6805a377a5c849ff5f1615295ffd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mutt (1.5.19-1) experimental; urgency=low
+
+  * New upstream version.
+    + Header weeding changed in default config; now we ignore * and unignore
+      from: subject to cc date x-mailer x-url user-agent. (Mutt: #286)
+    + $move now defaults to "no" instead of "ask-no".
+
+ -- Christoph Berg <myon@debian.org>  Thu, 15 Jan 2009 22:44:09 +0100
+

 mutt (1.5.18-4) unstable; urgency=low
 
   * In order to evade a conflict with the sidebar patch, move the set_xterm_*
 mutt (1.5.18-4) unstable; urgency=low
 
   * In order to evade a conflict with the sidebar patch, move the set_xterm_*

diff --git a/debian/patches/debian-specific/Muttrc b/debian/patches/debian-specific/Muttrc
index 88a08d7444ee3c7fd4dde5fbdf89e3db26745faa..bc8db211585a480ea610fe9b50611fc444ccd16e 100644 (file)
--- a/debian/patches/debian-specific/Muttrc
+++ b/debian/patches/debian-specific/Muttrc
@@ -1,14 +1,14 @@
+# 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
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head

-@@ -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
-+
+@@ -12,6 +12,32 @@ unignore from: subject to cc date x-mail
+ # 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


@@ -34,10 +34,11 @@
 +
 +# 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,7 +48,7 @@ macro index,pager,attach,compose \cb "\
+ 
+@@ -23,7 +49,7 @@ macro index,pager,attach,compose \cb "\

  "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


@@ -46,7 +47,7 @@
  
  # 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"

-@@ -30,7 +60,7 @@ bind browser y exit
+@@ -35,7 +61,7 @@ bind browser y exit

  # append-hook \\.gz$ "gzip -c %t >> %f"
  
  # If Mutt is unable to determine your site's domain name correctly, you can
  # append-hook \\.gz$ "gzip -c %t >> %f"
  
  # If Mutt is unable to determine your site's domain name correctly, you can


@@ -55,7 +56,7 @@
  #
  # set hostname=cs.hmc.edu
  
  #
  # set hostname=cs.hmc.edu
  

-@@ -92,6 +122,9 @@ attachments   +I text/plain
+@@ -101,6 +127,9 @@ attachments   +I text/plain

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

diff --git a/debian/patches/debian-specific/build_doc_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff
index 5cbd7624f8c54c9037b4a6aa17aab5bbe06f6e82..6a5159fd63c3963bceff2498b251b7cff3f25bf5 100644 (file)
--- a/debian/patches/debian-specific/build_doc_adjustments.diff
+++ b/debian/patches/debian-specific/build_doc_adjustments.diff
@@ -1,25 +1,23 @@
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am

-@@ -100,8 +100,9 @@ uninstall-local:
+@@ -98,7 +98,8 @@ uninstall-local:

  
  check:
  
  check:

- manual.txt: manual.html db-cleanup.xsl
--      -xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
--      -lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
-+      xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
+ manual.txt: manual.html
+-      -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \

 +      links.main -dump $< > $@ || links -dump $< > $@ || \
 +      links.main -dump $< > $@ || links -dump $< > $@ || \

-+      lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
-       w3m -dump manual-txt.html > $@ || \
-       elinks -dump -no-numbering -no-references manual-txt.html > $@
++      LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \
+       LC_ALL=C w3m -dump manual.html > $@ || \
+       LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@

  
  

-@@ -115,10 +116,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked
+@@ -112,10 +113,10 @@ stamp-doc-rc: $(top_srcdir)/init.h maked

        touch stamp-doc-rc
  
        touch stamp-doc-rc
  

- manual.html: $(srcdir)/html.xsl stamp-doc-xml
+ manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css

 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 +      xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
  
 -      -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 +      xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
  

- stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml
+ stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css

 -      -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
 +      xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
 -      -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
 +      xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked

diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults
index ea8310a8a06ad64100828971a426e60b86b6df36..a2efe86993cfdf6149c45b9e615f2def1bc78710 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,26 +1,26 @@
 --- a/init.h
 +++ b/init.h
 --- a/init.h
 +++ b/init.h

-@@ -295,6 +295,9 @@ struct option_t MuttVars[] = {
+@@ -304,6 +304,9 @@ struct option_t MuttVars[] = {

    ** .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 },
    /*

-@@ -825,6 +828,9 @@ struct option_t MuttVars[] = {
+@@ -866,6 +869,9 @@ struct option_t MuttVars[] = {

    ** one is not used.
    ** .pp
    ** one is not used.
    ** .pp

-   ** Also see ``$$use_domain'' and ``$$hidden_host''.
+   ** 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 },
    /*

-@@ -1338,6 +1344,9 @@ struct option_t MuttVars[] = {
+@@ -1399,6 +1405,9 @@ struct option_t MuttVars[] = {

    ** 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.


@@ -29,8 +29,8 @@
 +  ** ``mixmaster-filter'' in /etc/Muttrc.
    */
  #endif
 +  ** ``mixmaster-filter'' in /etc/Muttrc.
    */
  #endif

- 
-@@ -1887,6 +1896,10 @@ struct option_t MuttVars[] = {
+   { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
+@@ -1999,6 +2008,10 @@ struct option_t MuttVars[] = {

    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)


@@ -41,29 +41,29 @@
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*

-@@ -2093,6 +2106,9 @@ struct option_t MuttVars[] = {
-   ** certificates are also automatically accepted.
-   ** .pp
-   ** Example: set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
+@@ -2237,6 +2250,9 @@ struct option_t MuttVars[] = {
+   ** .ts
+   ** set ssl_ca_certificates_file=/etc/ssl/certs/ca-certificates.crt
+   ** .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_SSL_GNUTLS */
  #endif /* defined(USE_SSL) */
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, this variable defaults to the example
 +  ** mentioned. This file is managed by the ``ca-certificates'' package.
    */
  # endif /* USE_SSL_GNUTLS */
  #endif /* defined(USE_SSL) */

-@@ -2683,6 +2699,9 @@ struct option_t MuttVars[] = {
+@@ -2873,6 +2889,9 @@ struct option_t MuttVars[] = {

    ** .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 },
    /*

-@@ -3100,6 +3119,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
+@@ -3306,6 +3325,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

    ** in this case.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by
    ** in this case.
 +  ** .pp
 +  ** \fBNote:\fP On Debian systems, exim4 and postfix strip BCC headers by

diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff
index f6b6806aae0f84d80a6fed5a6f02c8c20d9a537d..13baea5395c9596fdc07131d79416ea9fa2b5152 100644 (file)
--- a/debian/patches/debian-specific/use_usr_bin_editor.diff
+++ b/debian/patches/debian-specific/use_usr_bin_editor.diff
@@ -1,6 +1,6 @@
 --- a/init.c
 +++ b/init.c
 --- a/init.c
 +++ b/init.c

-@@ -3070,7 +3070,7 @@ void mutt_init (int skip_sys_rc, LIST *c
+@@ -3114,7 +3114,7 @@ void mutt_init (int skip_sys_rc, LIST *c

    {
      p = getenv ("EDITOR");
      if (!p)
    {
      p = getenv ("EDITOR");
      if (!p)


@@ -11,12 +11,12 @@
    Visual = safe_strdup (p);
 --- a/init.h
 +++ b/init.h
    Visual = safe_strdup (p);
 --- a/init.h
 +++ b/init.h

-@@ -552,7 +552,7 @@ struct option_t MuttVars[] = {
+@@ -589,7 +589,7 @@ struct option_t MuttVars[] = {

    ** .pp
    ** This variable specifies which editor is used by mutt.
    ** .pp
    ** This variable specifies which editor is used by mutt.

-   ** It defaults to the value of the VISUAL, or EDITOR, environment
--  ** variable, or to the string "vi" if neither of those are set.
-+  ** variable, or to the string "/usr/bin/editor" if neither of those are set.
+   ** It defaults to the value of the \fC$$$VISUAL\fP, or \fC$$$EDITOR\fP, environment
+-  ** variable, or to the string ``vi'' if neither of those are set.
++  ** variable, or to the string ``/usr/bin/editor'' if neither of those are set.

    */
    { "encode_from",    DT_BOOL, R_NONE, OPTENCODEFROM, 0 },
    /*
    */
    { "encode_from",    DT_BOOL, R_NONE, OPTENCODEFROM, 0 },
    /*

diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index 4605c433c5e69eea6ef678aa6d205020a7e0a802..c6c439dd75934ef2d661bea68cc15137c0a04fea 100644 (file)
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -12,6 +12,8 @@ The home page for this patch is:
 
 * Changes made:
   - 2008-05-20 myon: refreshed to remove hunks in auto* files
 
 * Changes made:
   - 2008-05-20 myon: refreshed to remove hunks in auto* files

+  - 2009-09-15 myon: refreshed for mutt-1.5.19
+                     status.c:103: add sizeof (tmp) to mutt_pretty_mailbox

 
 == END PATCH
 --- /dev/null
 
 == END PATCH
 --- /dev/null


@@ -548,7 +550,7 @@ The home page for this patch is:
 +void mutt_fast_close_compressed (CONTEXT *);
 --- a/configure.ac
 +++ b/configure.ac
 +void mutt_fast_close_compressed (CONTEXT *);
 --- a/configure.ac
 +++ b/configure.ac

-@@ -787,6 +787,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
+@@ -795,6 +795,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN

                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  


@@ -562,7 +564,7 @@ The home page for this patch is:
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
 --- a/curs_main.c
 +++ b/curs_main.c
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
 --- a/curs_main.c
 +++ b/curs_main.c

-@@ -1132,6 +1132,11 @@ int mutt_index_menu (void)
+@@ -1128,6 +1128,11 @@ int mutt_index_menu (void)

          {
          int check;
  
          {
          int check;
  


@@ -576,7 +578,7 @@ The home page for this patch is:
  
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
  
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head

-@@ -4799,6 +4799,205 @@ macro pager \cb |urlview\n
+@@ -5160,6 +5160,205 @@ macro pager \cb |urlview\n

  
  </chapter>
  
  
  </chapter>
  


@@ -784,7 +786,7 @@ The home page for this patch is:
  
 --- a/doc/Muttrc
 +++ b/doc/Muttrc
  
 --- a/doc/Muttrc
 +++ b/doc/Muttrc

-@@ -24,6 +24,11 @@ macro generic,pager <F1> "<shell-escape>
+@@ -29,6 +29,11 @@ macro generic,pager <F1> "<shell-escape>

  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  bind browser y exit
  
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  bind browser y exit
  


@@ -798,7 +800,7 @@ The home page for this patch is:
  #
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head
  #
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head

-@@ -24,6 +24,11 @@ macro generic,pager <F1> "<shell-escape>
+@@ -29,6 +29,11 @@ macro generic,pager <F1> "<shell-escape>

  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  bind browser y exit
  
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  bind browser y exit
  


@@ -869,7 +871,7 @@ The home page for this patch is:
        )
 --- a/init.h
 +++ b/init.h
        )
 --- a/init.h
 +++ b/init.h

-@@ -3272,6 +3272,11 @@ struct command_t Commands[] = {
+@@ -3452,6 +3452,11 @@ struct command_t Commands[] = {

    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },
    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },


@@ -883,7 +885,7 @@ The home page for this patch is:
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 --- a/main.c
 +++ b/main.c
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 --- a/main.c
 +++ b/main.c

-@@ -403,6 +403,12 @@ static void show_version (void)
+@@ -402,6 +402,12 @@ static void show_version (void)

  #else
        "-LOCALES_HACK  "
  #endif
  #else
        "-LOCALES_HACK  "
  #endif


@@ -907,8 +909,8 @@ The home page for this patch is:
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
        edit.c enter.c flags.c init.c filter.c from.c \
        getdomain.c group.c \
        commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
        edit.c enter.c flags.c init.c filter.c from.c \
        getdomain.c group.c \

-@@ -57,7 +57,7 @@ EXTRA_mutt_SOURCES = account.c md5.c mut
-       utf8.c wcwidth.c 
+@@ -57,7 +57,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c 
+       bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h

  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 -      configure account.h \
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
 -      configure account.h \


@@ -929,7 +931,7 @@ The home page for this patch is:
  #include <sys/stat.h>
  #include <dirent.h>
  #include <string.h>
  #include <sys/stat.h>
  #include <dirent.h>
  #include <string.h>

-@@ -1037,6 +1041,12 @@ bail:  /* Come here in case of disaster 
+@@ -1038,6 +1042,12 @@ bail:  /* Come here in case of disaster 

  int mbox_close_mailbox (CONTEXT *ctx)
  {
    mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
  int mbox_close_mailbox (CONTEXT *ctx)
  {
    mx_unlock_file (ctx->path, fileno (ctx->fp), 1);


@@ -944,7 +946,7 @@ The home page for this patch is:
    return 0;
 --- a/mutt.h
 +++ b/mutt.h
    return 0;
 --- a/mutt.h
 +++ b/mutt.h

-@@ -160,6 +160,11 @@ typedef enum
+@@ -140,6 +140,11 @@ typedef enum

  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
  #define M_SEND2HOOK     (1<<11)
  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
  #define M_SEND2HOOK     (1<<11)


@@ -956,7 +958,7 @@ The home page for this patch is:
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1

-@@ -892,6 +897,11 @@ typedef struct _context
+@@ -872,6 +877,11 @@ typedef struct _context

    int flagged;                        /* how many flagged messages */
    int msgnotreadyet;          /* which msg "new" in pager, -1 if none */
  
    int flagged;                        /* how many flagged messages */
    int msgnotreadyet;          /* which msg "new" in pager, -1 if none */
  


@@ -1082,10 +1084,50 @@ The home page for this patch is:
  WHERE short DefaultMagic INITVAL (M_MBOX);
 --- a/po/de.po
 +++ b/po/de.po
  WHERE short DefaultMagic INITVAL (M_MBOX);
 --- a/po/de.po
 +++ b/po/de.po

-@@ -1289,6 +1289,48 @@ msgstr "Prüfung des Absenders fehlgeschl
- msgid "Failed to figure out sender"
- msgstr "Kann Absender nicht ermitteln"
+@@ -3,7 +3,7 @@ msgstr ""
+ "Project-Id-Version: 1.5.18\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2009-01-05 16:36-0800\n"
+-"PO-Revision-Date: 2008-05-18 10:28+0200\n"
++"PO-Revision-Date: 2009-01-15 23:09+0100\n"
+ "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
+ "Language-Team: German <mutt-po@mutt.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -1975,6 +1975,10 @@ msgstr "Hilfe für %s"
+ msgid "Bad history file format (line %d)"
+ msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)"

  
  

++#: hook.c:96
++msgid "badly formatted command string"
++msgstr "Hook enthält nicht die Muster %f und %t"
++
+ #: hook.c:251
+ #, c-format
+ msgid "unhook: Can't do unhook * from within a hook."
+@@ -2718,18 +2722,10 @@ msgstr "Lese %s..."
+ msgid "Mailbox is corrupt!"
+ msgstr "Mailbox fehlerhaft!"
+ 
+-#: mbox.c:678
+-msgid "Mailbox was corrupted!"
+-msgstr "Mailbox wurde zerstört!"
+-
+ #: mbox.c:719 mbox.c:976
+ msgid "Fatal error!  Could not reopen mailbox!"
+ msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
+ 
+-#: mbox.c:728
+-msgid "Unable to lock mailbox!"
+-msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
+-
+ #. this means ctx->changed or ctx->deleted was set, but no
+ #. * messages were found to be changed or deleted.  This should
+ #. * never happen, is we presume it is a bug in mutt.
+@@ -5298,3 +5294,45 @@ msgstr "Zeige S/MIME Optionen"
+ 
+ #~ msgid "Authentication method is unknown."
+ #~ msgstr "Authentifizierungsmethode unbekannt."
++

 +#: compress.c:203 mbox.c:661
 +msgid "Mailbox was corrupted!"
 +msgstr "Mailbox wurde zerstört!"
 +#: compress.c:203 mbox.c:661
 +msgid "Mailbox was corrupted!"
 +msgstr "Mailbox wurde zerstört!"


@@ -1127,40 +1169,6 @@ The home page for this patch is:
 +#, c-format
 +msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n"
 +#, c-format
 +msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n"

-+
- #: crypt.c:69
- #, c-format
- msgid " (current time: %c)"
-@@ -1958,6 +2000,10 @@ msgstr "Hilfe für %s"
- msgid "Bad history file format (line %d)"
- msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)"
- 
-+#: hook.c:96
-+msgid "badly formatted command string"
-+msgstr "Hook enthält nicht die Muster %f und %t"
-+
- #: hook.c:251
- #, c-format
- msgid "unhook: Can't do unhook * from within a hook."
-@@ -2687,18 +2733,10 @@ msgstr "Lese %s..."
- msgid "Mailbox is corrupt!"
- msgstr "Mailbox fehlerhaft!"
- 
--#: mbox.c:678
--msgid "Mailbox was corrupted!"
--msgstr "Mailbox wurde zerstört!"
--
- #: mbox.c:719 mbox.c:975
- msgid "Fatal error!  Could not reopen mailbox!"
- msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!"
- 
--#: mbox.c:728
--msgid "Unable to lock mailbox!"
--msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!"
--
- #. this means ctx->changed or ctx->deleted was set, but no
- #. * messages were found to be changed or deleted.  This should
- #. * never happen, is we presume it is a bug in mutt.

 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -8,6 +8,7 @@ charset.c
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -8,6 +8,7 @@ charset.c


@@ -1181,10 +1189,14 @@ The home page for this patch is:
 +      if (Context && Context->compressinfo && Context->realpath)
 +      {
 +       strfcpy (tmp, Context->realpath, sizeof (tmp));
 +      if (Context && Context->compressinfo && Context->realpath)
 +      {
 +       strfcpy (tmp, Context->realpath, sizeof (tmp));

-+       mutt_pretty_mailbox (tmp);
++       mutt_pretty_mailbox (tmp, sizeof (tmp));

 +      }
 +      else
 +#endif
        if (Context && Context->path)
        {
        strfcpy (tmp, Context->path, sizeof (tmp));
 +      }
 +      else
 +#endif
        if (Context && Context->path)
        {
        strfcpy (tmp, Context->path, sizeof (tmp));

+--- a/PATCHES
++++ b/PATCHES
+@@ -0,0 +1 @@
++patch-1.5.18.rr.compressed.1

diff --git a/debian/patches/features/sensible_browser_position b/debian/patches/features/sensible_browser_position
index 7e308839c9268fe40d9738ebfb079709377f8cb4..3ee8ce2cdf6f5f614c4557e3fc43f202485c3c2c 100644 (file)
--- a/debian/patches/features/sensible_browser_position
+++ b/debian/patches/features/sensible_browser_position
@@ -3,11 +3,12 @@ This is the sensible browser position patch by Haakon Riiser.
 
   * Found in: <20050309162127.GA5656@s>
     http://lists.df7cb.de/mutt/message/20050309.162127.a244a894.en.html
 
   * Found in: <20050309162127.GA5656@s>
     http://lists.df7cb.de/mutt/message/20050309.162127.a244a894.en.html

+  * myon 2009-01-15: refreshed for mutt-1.5.19

 
 == END PATCH
 --- a/menu.c
 +++ b/menu.c
 
 == END PATCH
 --- a/menu.c
 +++ b/menu.c

-@@ -840,8 +840,12 @@ int menu_redraw (MUTTMENU *menu)
+@@ -859,8 +859,12 @@ int menu_redraw (MUTTMENU *menu)

  
  int mutt_menuLoop (MUTTMENU *menu)
  {
  
  int mutt_menuLoop (MUTTMENU *menu)
  {


@@ -20,7 +21,7 @@ This is the sensible browser position patch by Haakon Riiser.
    FOREVER
    {
      if (option (OPTMENUCALLER))
    FOREVER
    {
      if (option (OPTMENUCALLER))

-@@ -1073,6 +1077,8 @@ int mutt_menuLoop (MUTTMENU *menu)
+@@ -1088,6 +1092,8 @@ int mutt_menuLoop (MUTTMENU *menu)

        break;
  
        default:
        break;
  
        default:


@@ -39,7 +40,7 @@ This is the sensible browser position patch by Haakon Riiser.
  static char LastDir[_POSIX_PATH_MAX] = "";
  static char LastDirBackup[_POSIX_PATH_MAX] = "";
  
  static char LastDir[_POSIX_PATH_MAX] = "";
  static char LastDirBackup[_POSIX_PATH_MAX] = "";
  

-@@ -506,19 +507,38 @@ static void init_menu (struct browser_st
+@@ -511,9 +512,13 @@ static void init_menu (struct browser_st

    menu->tagged = 0;
    
    if (buffy)
    menu->tagged = 0;
    
    if (buffy)


@@ -51,16 +52,11 @@ This is the sensible browser position patch by Haakon Riiser.
    {
 +    menu->is_mailbox_list = 0;
      strfcpy (path, LastDir, sizeof (path));
    {
 +    menu->is_mailbox_list = 0;
      strfcpy (path, LastDir, sizeof (path));

-     mutt_pretty_mailbox (path);
+     mutt_pretty_mailbox (path, sizeof (path));

  #ifdef USE_IMAP
  #ifdef USE_IMAP

--  if (state->imap_browse && option (OPTIMAPLSUB))
--    snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"),
--            path, NONULL (Mask.pattern));
--  else
-+    if (state->imap_browse && option (OPTIMAPLSUB))
-+      snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"),
-+              path, NONULL (Mask.pattern));
-+    else
+@@ -522,8 +527,23 @@ static void init_menu (struct browser_st
+             path, NONULL (Mask.pattern));
+   else

  #endif
 -    snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
 -            path, NONULL(Mask.pattern));
  #endif
 -    snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
 -            path, NONULL(Mask.pattern));


@@ -84,7 +80,7 @@ This is the sensible browser position patch by Haakon Riiser.
    }
    menu->redraw = REDRAW_FULL;
  }
    }
    menu->redraw = REDRAW_FULL;
  }

-@@ -694,7 +714,6 @@ void _mutt_select_file (char *f, size_t 
+@@ -706,7 +726,6 @@ void _mutt_select_file (char *f, size_t 

  #endif
            )
          {
  #endif
            )
          {


@@ -102,7 +98,3 @@ This is the sensible browser position patch by Haakon Riiser.
  
    /* Setting dialog != NULL overrides normal menu behaviour. 
     * In dialog mode menubar is hidden and prompt keys are checked before
  
    /* Setting dialog != NULL overrides normal menu behaviour. 
     * In dialog mode menubar is hidden and prompt keys are checked before

---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.8.hr.sensible_browser_position.3

diff --git a/debian/patches/series b/debian/patches/series
index 3cee92af6ab7e74cdf215f80e93ed2b3e4f76bd6..4c8455583fd895a16dfb82dfaf5ea7f68ad74f46 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,14 +25,11 @@ debian-specific/assumed_charset-compat
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 
 misc/define-pgp_getkeys_command.diff 
 misc/gpg.rc-paths
 

-# bug fixes
-upstream/489283-multipart-decoding
-

 mutt.org
 # extra patches for mutt-patched
 mutt-patched/sidebar-compat-revert.debian
 mutt.org
 # extra patches for mutt-patched
 mutt-patched/sidebar-compat-revert.debian

-mutt-patched/sidebar
-mutt-patched/sidebar-compat-apply.debian
+#mutt-patched/sidebar
+#mutt-patched/sidebar-compat-apply.debian

 
 # unapplied patches for custom packages
 # not-applied/chdir
 
 # unapplied patches for custom packages
 # not-applied/chdir

diff --git a/debian/patches/upstream/489283-multipart-decoding b/debian/patches/upstream/489283-multipart-decoding
deleted file mode 100644 (file)
index 0d00569..0000000
--- a/debian/patches/upstream/489283-multipart-decoding
+++ /dev/null
@@ -1,57 +0,0 @@
-changeset:   5421:f5fe657f0633
-branch:      HEAD
-user:        Brendan Cully <brendan@kublai.com>
-date:        Tue Jun 24 23:12:02 2008 -0700
-summary:     Make multipart decoding a little more forgiving.
-
-#diff -r a2e8f6fab8d3 -r f5fe657f0633 ChangeLog
-#--- a/ChangeLog       Thu Jan 01 00:00:00 1970 +0000
-#+++ b/ChangeLog       Tue Jun 24 23:12:02 2008 -0700
-#@@ -1,3 +1,13 @@
-#+1970-01-01 00:00 +0000  Brendan Cully  <brendan@kublai.com>  (a2e8f6fab8d3)
-#+
-#+     * smtp.c: Test that envelope from or from is set before attempting
-#+     SMTP delivery. Closes #3079.
-#+
-#+2008-06-14 18:23 -0700  Christoph Berg  <cb@df7cb.de>  (4b790909a037)
-#+
-#+     * doc/mbox.man: Document that From_ lines use asctime-style dates,
-#+     not RFC2822 dates. Closes #3077.
-#+
-# 2008-06-11 22:45 -0700  Alexey I. Froloff  <raorn@altlinux.org>  (1e8ca708a52f)
-# 
-#      * attach.c: Do not attempt to close invalid descriptors. Closes #3075
-diff -r a2e8f6fab8d3 -r f5fe657f0633 handler.c
---- a/handler.c        Thu Jan 01 00:00:00 1970 +0000
-+++ b/handler.c        Tue Jun 24 23:12:02 2008 -0700
-@@ -1199,11 +1199,12 @@
-     
-     if (rc)
-     {
-+      mutt_error ("One or more parts of this message could not be displayed");
-       dprint (1, (debugfile, "Failed on attachment #%d, type %s/%s.\n", count, TYPE(p), NONULL (p->subtype)));
-     }
-     
--    if (rc || ((s->flags & M_REPLYING)
--               && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE)))
-+    if ((s->flags & M_REPLYING)
-+        && (option (OPTINCLUDEONLYFIRST)) && (s->flags & M_FIRSTDONE))
-       break;
-   }
- 
-@@ -1564,6 +1565,14 @@
- 
-     if (!handler)
-       handler = multipart_handler;
-+    
-+    if (b->encoding != ENC7BIT && b->encoding != ENC8BIT
-+        && b->encoding != ENCBINARY)
-+    {
-+      dprint (1, (debugfile, "Bad encoding type %d for multipart entity, "
-+                  "assuming 7 bit\n", b->encoding));
-+      b->encoding = ENC7BIT;
-+    }
-   }
-   else if (WithCrypto && b->type == TYPEAPPLICATION)
-   {
-

diff --git a/debian/rules b/debian/rules
index 87fb63ce9831cc17f8f8590f04093266a0287f82..84363f3db77169d81ea9ee708cc8541718232691 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/quilt/quilt.make
 
 ###
 # build a separate mutt-patched package?
 
 ###
 # build a separate mutt-patched package?

-BUILD_PATCHED := yes
+#BUILD_PATCHED := yes -- disabled until there is a sidebar patch for 1.5.19

 ###
 # header cache backend
 # HCACHE_DB := bdb
 ###
 # header cache backend
 # HCACHE_DB := bdb