adding a patch to fix 531430

diff --git a/debian/changelog b/debian/changelog
index b016a1b9ccbebdf78fdab334b5994cfd02f5b26c..e093372bcdc8fed98d501fd32740adb75d6b619d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ mutt (1.5.20-2) unstable; urgency=low
       cannot be opened (Closes: 533209)
     + upstream/533459-unmailboxes: fixes the segfault with the unmailboxes 
       command (Closes: 533459)
-    + 533439-mbox-time.patch: do not corrupt the atime/mtime of mboxes when 
-      opened (Closes: 533439)
+    + upstream/533439-mbox-time.patch: do not corrupt the atime/mtime of 
+      mboxes when opened (Closes: 533439)
+    + upstream/531430-imapuser.patch: ask the user for the right information
+      while logging in on IMAP servers (Closes: 531430)
     + added the right copyright misc/smime_keys-manpage.patch
     + mutt-patched/sidebar: refreshed
     + mutt-patched/sidebar-{dotted,sorted} added (Closes: 523774)

diff --git a/debian/control b/debian/control
index d2b6f7991ee342178fb392f2bbdbaf45f7a40cf3..b6fe732808c48cee45c59be70dd7481f720ef100 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: standard
 Maintainer: Christoph Berg <myon@debian.org>
 Uploaders: Adeodato Simó <dato@net.com.org.es>, Antonio Radici <antonio@dyne.org>
 Build-Depends: debhelper (>> 7), quilt, automake, gawk, gettext, xsltproc,
- docbook-xml, docbook-xsl, links2, libncurses5-dev, libsasl2-dev, libgnutls-dev,
+ docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev,
  libidn11-dev, zlib1g-dev, libncursesw5-dev, libgdbm-dev, libkrb5-dev, pkg-config,
  libgpgme11-dev
 Standards-Version: 3.8.1

diff --git a/debian/patches/series b/debian/patches/series
index 09a329dc61aac27929975b0ba59383038edeb191..1683c6ca52b99c73e0e72a280cb8b2ca246ec5a0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,6 +43,7 @@ misc/smime.rc
 upstream/533209-mutt_perror.patch
 upstream/533459-unmailboxes
 upstream/533439-mbox-time.patch
+upstream/531430-imapuser.patch
 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch

diff --git a/debian/patches/upstream/531430-imapuser.patch b/debian/patches/upstream/531430-imapuser.patch
new file mode 100644 (file)
index 0000000..a32939a
--- /dev/null
+++ b/debian/patches/upstream/531430-imapuser.patch
@@ -0,0 +1,14 @@
+fixes a problem where the imap->login has the precedence so the user
+is asked with wrong informaton, see upstream #3240
+
+--- a/account.c
++++ b/account.c
+@@ -218,7 +218,7 @@
+   else
+   {
+     snprintf (prompt, sizeof (prompt), _("Password for %s@%s: "),
+-              account->flags & M_ACCT_LOGIN ? account->login : account->user,
++              ((account->flags & M_ACCT_LOGIN) && !(account->user)) ? account->login : account->user,
+               account->host);
+     account->pass[0] = '\0';
+     if (mutt_get_password (prompt, account->pass, sizeof (account->pass)))

diff --git a/debian/rules b/debian/rules
index 1b5641f63e6aa76d5f3214ace21c16a0fe81def6..e9154b370ccd4ac81f2249baee80e397997e22f1 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_PATCHED := yes
+BUILD_PATCHED := no
 ###
 # header cache backend
 # HCACHE_DB := bdb