-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Package: mutt
Version: 1.5.9-1.1
Severity: important
Tags: patch

I have to create this new bug as there seems to be a bug in the bug
tracker not accepting followups to existing bugs. The original bug is
#267015.

There is the forward:
No I just wait so long for the maintainer to fix the important bug. It
was causing me not to update the version 1.5.6 anymore.

Moreover the broken mutt is going to sarge.

So I did this patch by myself. It is only small things to do to fix it.

Please let this patch go into the main distribution and to sarge that
mutt will get usefull again.

Here is the patch (I named it "correct_charset"):
- -----------------------------------------------------------------------------
diff -urN mutt-1.5.9.orig/pgp.c mutt-1.5.9/pgp.c
- --- mutt-1.5.9.orig/pgp.c     2005-02-19 23:03:16.000000000 +0100
+++ mutt-1.5.9/pgp.c    2005-05-05 16:31:28.000000000 +0200
@@ -410,7 +410,7 @@
        int c;
        rewind (pgpout);
        state_set_prefix (s);
- -     fc = fgetconv_open (pgpout, "utf-8", Charset, 0);
+       fc = fgetconv_open (pgpout, body_charset, Charset, 0);
        while ((c = fgetconv (fc)) != EOF)
          state_prefix_putc (c, s);
        fgetconv_close (&fc);
@@ -1354,12 +1354,9 @@
     int c;
     FGETCONV *fc;
     
- -    if (flags & ENCRYPT)
- -      send_charset = "us-ascii";
- -    else
- -      send_charset = "utf-8";
+    send_charset = body_charset;
     
- -    fc = fgetconv_open (fp, from_charset, "utf-8", M_ICONV_HOOK_FROM);
+    fc = fgetconv_open (fp, from_charset, send_charset, M_ICONV_HOOK_FROM);
     while ((c = fgetconv (fc)) != EOF)
       fputc (c, pgpin);
     
- -----------------------------------------------------------------------------

- -- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (800, 'testing'), (70, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.4.29
Locale: LANG=de_DE, LC_CTYPE=de_DE (charmap=ISO-8859-1) (ignored: LC_ALL set to 
de_DE)

Versions of packages mutt depends on:
ii  exim4                       4.50-4       metapackage to ease exim MTA (v4) 
ii  exim4-daemon-heavy [mail-tr 4.50-4       exim MTA (v4) daemon with extended
ii  libc6                       2.3.2.ds1-21 GNU C Library: Shared libraries an
ii  libdb4.3                    4.3.27-2     Berkeley v4.3 Database Libraries [
ii  libgnutls11                 1.0.16-9     GNU TLS library - runtime library
ii  libidn11                    0.5.13-1.0   GNU libidn library, implementation
ii  libncursesw5                5.4-4        Shared libraries for terminal hand
ii  libsasl2                    2.1.19-1.5   Authentication abstraction library

- -- no debconf information

- -- 
Klaus Ethgen                            http://www.ethgen.de/
pub  2048R/D1A4EDE5 2000-02-26 Klaus Ethgen <[EMAIL PROTECTED]>
Fingerprint: D7 67 71 C4 99 A6 D4 FE  EA 40 30 57 3C 88 26 2B
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iQEVAwUBQnpUK5+OKpjRpO3lAQIpfAf9GdB7sHGk29wADM34j/ila7romhbACMti
h8+4rARUnXVWZdOcLBXYBj01OTS7+rvexemuGGAFuIh9vZXJMXsl/b5Vg1OVhaoJ
ROCVBIQaSu3t7qstF+W1o73KUQp8/ouOlw8hcqf5boE7EFN2Zhf1c50QP44G5qxA
sv89eC0T6ymlJAZbG91HeWRInEnfN5eFxpcUj3+WRkB3tU7LC676dGAmv3nkJICB
bMfAO9wOsVF5CvzHI+bGrR9w4SWqKGx3bYYUSIB1jGwbnlHztkbsk1kmDYQExAr9
1zViE+7xzwQBs7zjSkSRRNk4KtALTI9EQz1so8RDj1mExzf6a+3Z/w==
=uynl
-----END PGP SIGNATURE-----


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to