Merge branch '531430+imapuser'

diff --git a/debian/changelog b/debian/changelog
index 90d3e3fe1c01e5a0ed34c18796cbd34eb69a63bf..9273c93f5ecb043f48557f7e32beecaff1e6ebf9 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.patch: fixes a 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/patches/series b/debian/patches/series
index 992492614b63a0f384db06a4cc20f54820839071..e0b2619f18161f4d839c2931c1038899d126e7bc 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.patch
 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