From 071ce68726994c2aaeaf4ca3886efddbd07064be Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Sat, 20 Jun 2009 00:37:47 +0100 Subject: [PATCH] adding a patch to fix 531430 --- debian/changelog | 6 ++++-- debian/control | 2 +- debian/patches/series | 1 + debian/patches/upstream/531430-imapuser.patch | 14 ++++++++++++++ debian/rules | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 debian/patches/upstream/531430-imapuser.patch diff --git a/debian/changelog b/debian/changelog index b016a1b..e093372 100644 --- 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 d2b6f79..b6fe732 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: standard Maintainer: Christoph Berg Uploaders: Adeodato Simó , Antonio Radici 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 09a329d..1683c6c 100644 --- 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 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 1b5641f..e9154b3 100755 --- 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 -- 2.43.0