Import mutt_1.5.11-5

diff --git a/debian/changelog b/debian/changelog
index 8336450a70593b30ea65f48d8338fbe6e37985dd..45ace40e1e763434610bfea464b2f45b09d4e227 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mutt (1.5.11-5) unstable; urgency=medium
+
+  * Unbreak Mutt in Turkish locales (tr_TR): include patch from CVS to use the
+    proper strcmp function in several places. Upstream bug #2144, reported in
+    both BTS by Recai Oktas. (Closes: #343655)
+
+  * Apply patch from Nik A. Melchior to fix formatting problem in muttrc(5). 
+    (Closes: #343030)
+
+ -- Adeodato Simó <dato@net.com.org.es>  Fri, 23 Dec 2005 23:18:44 +0100
+
 mutt (1.5.11-4) unstable; urgency=low
 
   * Update to CVS 2005-11-24 to fix the following bug (yay):

diff --git a/debian/patches/muttrc.man.spacing-fix.diff b/debian/patches/muttrc.man.spacing-fix.diff
new file mode 100644 (file)
index 0000000..cf68c3d
--- /dev/null
+++ b/debian/patches/muttrc.man.spacing-fix.diff
@@ -0,0 +1,16 @@
+Index: mutt/doc/muttrc.man.head
+===================================================================
+RCS file: /home/roessler/cvs/mutt/doc/muttrc.man.head,v
+retrieving revision 3.19
+diff -u -p -r3.19 muttrc.man.head
+--- mutt/doc/muttrc.man.head   4 Oct 2005 06:05:39 -0000       3.19
++++ mutt/doc/muttrc.man.head   23 Dec 2005 22:03:47 -0000
+@@ -437,7 +437,7 @@
+ ~v    message is part of a collapsed thread.
+ ~V    cryptographically verified messages
+ ~x \fIEXPR\fP messages which contain \fIEXPR\fP in the \(lqReferences\(rq field
+-~X \fIMIN\fP-\fIMAX\fP  messages with MIN - MAX attachments
++~X \fIMIN\fP-\fIMAX\fP        messages with MIN - MAX attachments
+ ~y \fIEXPR\fP messages which contain \fIEXPR\fP in the \(lqX-Label\(rq field
+ ~z \fIMIN\fP-\fIMAX\fP        messages with a size in the range \fIMIN\fP to \fIMAX\fP
+ ~=    duplicated messages (see $duplicate_threads)

diff --git a/upstream/patches/cvs_2005-12-16_turkish-fix b/upstream/patches/cvs_2005-12-16_turkish-fix
new file mode 100644 (file)
index 0000000..8a41e10
--- /dev/null
+++ b/upstream/patches/cvs_2005-12-16_turkish-fix
@@ -0,0 +1,206 @@
+Index: mutt/color.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/color.c,v
+retrieving revision 3.8
+retrieving revision 3.9
+diff -u -p -r3.8 -r3.9
+--- mutt/color.c       17 Sep 2005 20:46:10 -0000      3.8
++++ mutt/color.c       16 Dec 2005 18:49:40 -0000      3.9
+@@ -309,14 +309,14 @@ parse_color_name (const char *s, int *co
+ {
+   char *eptr;
+ 
+-  if (mutt_strncasecmp (s, "bright", 6) == 0)
++  if (ascii_strncasecmp (s, "bright", 6) == 0)
+   {
+     *attr |= brite;
+     s += 6;
+   }
+ 
+   /* allow aliases for xterm color resources */
+-  if (mutt_strncasecmp (s, "color", 5) == 0)
++  if (ascii_strncasecmp (s, "color", 5) == 0)
+   {
+     s += 5;
+     *col = strtol (s, &eptr, 10);
+Index: mutt/crypt.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/crypt.c,v
+retrieving revision 3.32
+retrieving revision 3.33
+diff -u -p -r3.32 -r3.33
+--- mutt/crypt.c       21 Oct 2005 04:35:37 -0000      3.32
++++ mutt/crypt.c       16 Dec 2005 18:49:40 -0000      3.33
+@@ -552,7 +552,7 @@ void convert_to_7bit (BODY *a)
+       convert_to_7bit (a->parts);
+     } 
+     else if (a->type == TYPEMESSAGE &&
+-           mutt_strcasecmp(a->subtype, "delivery-status"))
++           ascii_strcasecmp(a->subtype, "delivery-status"))
+     {
+       if(a->encoding != ENC7BIT)
+       mutt_message_to_7bit (a, NULL);
+@@ -808,15 +808,15 @@ int mutt_signed_handler (BODY *a, STATE 
+   
+   if ((WithCrypto & APPLICATION_PGP)
+       && protocol_major == TYPEAPPLICATION
+-      && !mutt_strcasecmp (protocol_minor, "pgp-signature"))
++      && !ascii_strcasecmp (protocol_minor, "pgp-signature"))
+     ;
+   else if ((WithCrypto & APPLICATION_SMIME)
+            && protocol_major == TYPEAPPLICATION
+-         && !(mutt_strcasecmp (protocol_minor, "x-pkcs7-signature")
+-             && mutt_strcasecmp (protocol_minor, "pkcs7-signature")))
++         && !(ascii_strcasecmp (protocol_minor, "x-pkcs7-signature")
++             && ascii_strcasecmp (protocol_minor, "pkcs7-signature")))
+     ;
+   else if (protocol_major == TYPEMULTIPART
+-         && !mutt_strcasecmp (protocol_minor, "mixed"))
++         && !ascii_strcasecmp (protocol_minor, "mixed"))
+     ;
+   else
+   {
+@@ -840,7 +840,7 @@ int mutt_signed_handler (BODY *a, STATE 
+       {
+         if ((WithCrypto & APPLICATION_PGP)
+               && signatures[i]->type == TYPEAPPLICATION 
+-            && !mutt_strcasecmp (signatures[i]->subtype, "pgp-signature"))
++            && !ascii_strcasecmp (signatures[i]->subtype, "pgp-signature"))
+         {
+           if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
+             goodsig = 0;
+@@ -850,8 +850,8 @@ int mutt_signed_handler (BODY *a, STATE 
+ 
+         if ((WithCrypto & APPLICATION_SMIME)
+               && signatures[i]->type == TYPEAPPLICATION 
+-            && (!mutt_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
+-                || !mutt_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
++            && (!ascii_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
++                || !ascii_strcasecmp(signatures[i]->subtype, "pkcs7-signature")))
+         {
+           if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
+             goodsig = 0;
+Index: mutt/handler.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/handler.c,v
+retrieving revision 3.25
+retrieving revision 3.26
+diff -u -p -r3.25 -r3.26
+--- mutt/handler.c     22 Nov 2005 12:21:14 -0000      3.25
++++ mutt/handler.c     16 Dec 2005 18:49:40 -0000      3.26
+@@ -1843,7 +1843,7 @@ int mutt_body_handler (BODY *b, STATE *s
+       handler = mutt_signed_handler;
+     }
+     else if ((WithCrypto & APPLICATION_PGP)
+-             && mutt_strcasecmp ("encrypted", b->subtype) == 0)
++             && ascii_strcasecmp ("encrypted", b->subtype) == 0)
+     {
+       p = mutt_get_parameter ("protocol", b->parameter);
+ 
+Index: mutt/init.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/init.c,v
+retrieving revision 3.46
+retrieving revision 3.47
+diff -u -p -r3.46 -r3.47
+--- mutt/init.c        5 Oct 2005 19:24:40 -0000       3.46
++++ mutt/init.c        16 Dec 2005 18:49:40 -0000      3.47
+@@ -834,9 +834,9 @@ static int parse_attach_list (BUFFER *bu
+     a = safe_malloc(sizeof(ATTACH_MATCH));
+ 
+     /* some cheap hacks that I expect to remove */
+-    if (!mutt_strcasecmp(buf->data, "any"))
++    if (!ascii_strcasecmp(buf->data, "any"))
+       a->major = safe_strdup("*/.*");
+-    else if (!mutt_strcasecmp(buf->data, "none"))
++    else if (!ascii_strcasecmp(buf->data, "none"))
+       a->major = safe_strdup("cheap_hack/this_should_never_match");
+     else
+       a->major = safe_strdup(buf->data);
+@@ -898,9 +898,9 @@ static int parse_unattach_list (BUFFER *
+   {
+     mutt_extract_token (buf, s, 0);
+ 
+-    if (!mutt_strcasecmp(buf->data, "any"))
++    if (!ascii_strcasecmp(buf->data, "any"))
+       tmp = safe_strdup("*/.*");
+-    else if (!mutt_strcasecmp(buf->data, "none"))
++    else if (!ascii_strcasecmp(buf->data, "none"))
+       tmp = safe_strdup("cheap_hack/this_should_never_match");
+     else
+       tmp = safe_strdup(buf->data);
+@@ -1001,13 +1001,13 @@ static int parse_attachments (BUFFER *bu
+     op = '+';
+     category--;
+   }
+-  if (!mutt_strncasecmp(category, "attachment", strlen(category))) {
++  if (!ascii_strncasecmp(category, "attachment", strlen(category))) {
+     if (op == '+')
+       listp = &AttachAllow;
+     else
+       listp = &AttachExclude;
+   }
+-  else if (!mutt_strncasecmp(category, "inline", strlen(category))) {
++  else if (!ascii_strncasecmp(category, "inline", strlen(category))) {
+     if (op == '+')
+       listp = &InlineAllow;
+     else
+@@ -1038,13 +1038,13 @@ static int parse_unattachments (BUFFER *
+     op = '+';
+     p--;
+   }
+-  if (!mutt_strncasecmp(p, "attachment", strlen(p))) {
++  if (!ascii_strncasecmp(p, "attachment", strlen(p))) {
+     if (op == '+')
+       listp = &AttachAllow;
+     else
+       listp = &AttachExclude;
+   }
+-  else if (!mutt_strncasecmp(p, "inline", strlen(p))) {
++  else if (!ascii_strncasecmp(p, "inline", strlen(p))) {
+     if (op == '+')
+       listp = &InlineAllow;
+     else
+Index: mutt/parse.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/parse.c,v
+retrieving revision 3.21
+retrieving revision 3.22
+diff -u -p -r3.21 -r3.22
+--- mutt/parse.c       21 Oct 2005 04:35:37 -0000      3.21
++++ mutt/parse.c       16 Dec 2005 18:49:40 -0000      3.22
+@@ -1542,7 +1542,7 @@ int count_body_parts (BODY *body, int fl
+     {
+       /* Always recurse multiparts, except multipart/alternative. */
+       shallrecurse = 1;
+-      if (!mutt_strcasecmp(bp->subtype, "alternative"))
++      if (!ascii_strcasecmp(bp->subtype, "alternative"))
+         shallrecurse = 0;
+ 
+       /* Don't count containers if they're top-level. */
+Index: mutt/smime.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/smime.c,v
+retrieving revision 3.47
+retrieving revision 3.48
+diff -u -p -r3.47 -r3.48
+--- mutt/smime.c       21 Oct 2005 04:35:38 -0000      3.47
++++ mutt/smime.c       16 Dec 2005 18:49:40 -0000      3.48
+@@ -1621,7 +1621,7 @@ int smime_verify_one (BODY *sigbdy, STAT
+       rewind (smimeerr);
+       
+       line = mutt_read_line (line, &linelen, smimeerr, &lineno);
+-      if (linelen && !mutt_strcasecmp (line, "verification successful"))
++      if (linelen && !ascii_strcasecmp (line, "verification successful"))
+       badsig = 0;
+ 
+       FREE (&line);
+@@ -1842,7 +1842,7 @@ static BODY *smime_handle_entity (BODY *
+     rewind (smimeerr);
+     
+     line = mutt_read_line (line, &linelen, smimeerr, &lineno);
+-    if (linelen && !mutt_strcasecmp (line, "verification successful"))
++    if (linelen && !ascii_strcasecmp (line, "verification successful"))
+       m->goodsig = 1;
+     FREE (&line);
+   }