patches/upstream/524420-segfault-reconnect-sasl.patch: sasl, mutt segfaults on reconn...

diff --git a/debian/changelog b/debian/changelog
index 9e2e58b688265cbf77b95ed537a02633f328ead1..2d0ea8803daff646eddc399b260b9b57aa7df9da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ mutt (1.5.19-4) unstable; urgency=low
       (Closes: 514960)
   * patches/misc/manpage-typos.patch
     + fixes some typos in the manpage (Closes: 428017)
+  * patches/upstream/524420-segfault-reconnect-sasl.patch
+    + sasl, mutt segfaults on reconnect to IMAPS server (Closes: 524420)
 
  -- Antonio Radici <antonio@dyne.org>  Tue, 26 May 2009 23:42:51 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index 0824d8913fd8a050aee04b68ca806834648246c2..555f2ac626c9380bd2ea322897c5e92cf7fd12ab 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,6 +33,7 @@ upstream/530661-mandatory-doubledash.patch
 upstream/375530-index-weirdness.patch
 upstream/493719-segfault-imap-close.patch
 upstream/514960-certificate-insecure-algorithm.patch
+upstream/524420-segfault-reconnect-sasl.patch
 
 misc/hyphen-as-minus.patch
 misc/manpage-typos.patch

diff --git a/debian/patches/upstream/524420-segfault-reconnect-sasl.patch b/debian/patches/upstream/524420-segfault-reconnect-sasl.patch
new file mode 100644 (file)
index 0000000..60e158b
--- /dev/null
+++ b/debian/patches/upstream/524420-segfault-reconnect-sasl.patch
@@ -0,0 +1,14 @@
+Mutt crashes when connection that used SASL is closed 
+and reopened again (e.g. network problem)
+see http://bugs.debian.org/524420 and http://bugs.mutt.org/3206
+
+--- a/mutt_sasl.c
++++ b/mutt_sasl.c
+@@ -481,6 +481,7 @@
+   conn->conn_close = sasldata->msasl_close;
+   conn->conn_read = sasldata->msasl_read;
+   conn->conn_write = sasldata->msasl_write;
++  conn->conn_poll = sasldata->msasl_poll;
+ 
+   /* release sasl resources */
+   sasl_dispose (&sasldata->saslconn);