Bug#685658: unblock: maildir-utils/0.9.8.5-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package maildir-utils
Dear release managers,
I would like to ask for an unblock request of maildir-utils. It is a bit
peculiar because a new release with a lot of new functionality in
the sub-packages mu4e (emacs mode for mu) was released 1 or two days
after freeze.
I have packaged the new version immediately (0.9.8.5-1 was accepted
into unstable on 2012-07-01), and since then only one bug report
(in the otherwise bug-free package) has appeared. This bug (#685472)
concerns 7bit encoding and was solved by cherry picking a fix from
upstream git, which removes some incorrect optimization. This was
version 0.9.8.5-2, and today I have uploaded another version -3
that only tightens the dependency of mu4e and maildir-utils-extra
(sub packages) onto the main package (maildir-utils) to the
very same version (plus/minus binNMU).
Of course the diff between testing's version 0.9.8.4-2 and 0.9.8.5-1
is too big, I will not include it, unless you are interested. I include
the NEWS announce below.
For the debdiff between 0.9.8.5-1 to -3 I attach it.
I know that this is a very unfortunate case, but I still ask for
an unblock due to the long time the new upstream has been in
unstable for now, and the history of very stable and low bug count.
If you need any further information or details, please let me know.
unblock maildir-utils/0.9.8.5-3
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.6.0-rc2+ (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
* NEWS (user visible changes)
** Release 0.9.8.5 <2012-07-01>
*** mu4e
- auto-completion of e-mail addresses
- inline display of images (see `mu4e-view-show-images'), uses imagemagick
if available
- interactively change number of headers / columns for showing headers with
C-+ and C-- in headers, view mode
- support flagging message
- navigate to previous/next queries like a web browser (with <M-left>,
<M-right>)
- narrow search results with '/'
- next/previous take a prefix arg now, to move to the nth previous/next message
- allow for writing rich-text messages with org-mode
- enable marking messages as Flagged
- custom marker functions (see manual)
- better "dwim" handling of buffer switching / killing
- deferred marking of message (i.e.., mark now, decide what to mark for
later)
- enable changing of sort order, display of threads
- clearer marks for marked messages
- fix sorting by subject (disregarding Re:, Fwd: etc.)
- much faster handling when there are many maildirs (speedbar)
- handle mailto: links
- improved, extended documentation
*** mu
- support .noupdate files (parallel to .noindex, dir is ignored unless we're
doing a --rebuild).
- append all inline text parts, when getting the text body
- respect custom maildir flags
- correctly handle the case where g_utf8_strdown (str) > len (str)
- make gtk, guile, webkit dependency optional, even if they are installed
diff -Nru maildir-utils-0.9.8.5/debian/changelog maildir-utils-0.9.8.5/debian/changelog
--- maildir-utils-0.9.8.5/debian/changelog 2012-07-02 08:12:16.000000000 +0900
+++ maildir-utils-0.9.8.5/debian/changelog 2012-08-23 09:23:02.000000000 +0900
@@ -1,3 +1,18 @@
+maildir-utils (0.9.8.5-3) unstable; urgency=low
+
+ * restrict mu4e and m-u-e's dependency on maildir-utils to the same
+ version (and including bin-nmus for mu4e)
+
+ -- Norbert Preining <preining@debian.org> Thu, 23 Aug 2012 09:22:35 +0900
+
+maildir-utils (0.9.8.5-2) unstable; urgency=low
+
+ * cherry pick git commit 4fa0c57d from upstream that fixes encoding
+ problems due to optimizations (Closes: #685472)
+ (thanks to Olaf Meeuwissen for the detailed analysis)
+
+ -- Norbert Preining <preining@debian.org> Tue, 21 Aug 2012 14:52:44 +0900
+
maildir-utils (0.9.8.5-1) unstable; urgency=low
* new upstream release
diff -Nru maildir-utils-0.9.8.5/debian/control maildir-utils-0.9.8.5/debian/control
--- maildir-utils-0.9.8.5/debian/control 2012-07-02 08:11:52.000000000 +0900
+++ maildir-utils-0.9.8.5/debian/control 2012-08-23 09:22:28.000000000 +0900
@@ -31,7 +31,7 @@
Architecture: all
Replaces: maildir-utils (<< 0.9.8.4)
Conflicts: maildir-utils (<< 0.9.8.4)
-Depends: ${misc:Depends}, maildir-utils, emacs23 | emacsen, dpkg (>= 1.15.4) | install-info
+Depends: ${misc:Depends}, maildir-utils (>= ${source:Version}), maildir-utils (<< ${source:Version}.1~), emacs23 | emacsen, dpkg (>= 1.15.4) | install-info
Description: e-mail client for Emacs based on mu (maildir-utils)
mu4e (mu-for-emacs) is an e-mail client for GNU-Emacs version 23 and
later, built on top of the mu e-mail search engine. mu4e is optimized
@@ -41,7 +41,7 @@
Section: mail
Priority: optional
Architecture: any
-Depends: maildir-utils, xdg-utils, ${shlibs:Depends}, ${misc:Depends}
+Depends: maildir-utils (= ${source:Version}), xdg-utils, ${shlibs:Depends}, ${misc:Depends}
Replaces: maildir-utils (<= 0.9.6-1), maildir-utils-gtk
Conflicts: maildir-utils-gtk
Description: Extra utilities for maildir-utils
diff -Nru maildir-utils-0.9.8.5/debian/patches/series maildir-utils-0.9.8.5/debian/patches/series
--- maildir-utils-0.9.8.5/debian/patches/series 2012-07-02 07:53:56.000000000 +0900
+++ maildir-utils-0.9.8.5/debian/patches/series 2012-08-21 15:55:55.000000000 +0900
@@ -5,4 +5,4 @@
fix-mug2-build
fix-manpages
disable-emacs-compile
-#upstream-xapian-ignore-third-digit
+upstream_4fa0c57d_iso-2022-jp
diff -Nru maildir-utils-0.9.8.5/debian/patches/upstream_4fa0c57d_iso-2022-jp maildir-utils-0.9.8.5/debian/patches/upstream_4fa0c57d_iso-2022-jp
--- maildir-utils-0.9.8.5/debian/patches/upstream_4fa0c57d_iso-2022-jp 1970-01-01 09:00:00.000000000 +0900
+++ maildir-utils-0.9.8.5/debian/patches/upstream_4fa0c57d_iso-2022-jp 2012-08-21 15:55:55.000000000 +0900
@@ -0,0 +1,49 @@
+---
+ lib/mu-msg-file.c | 23 +++++------------------
+ 1 file changed, 5 insertions(+), 18 deletions(-)
+
+Index: maildir-utils.git/lib/mu-msg-file.c
+===================================================================
+--- maildir-utils.git.orig/lib/mu-msg-file.c 2012-08-21 13:57:38.000000000 +0900
++++ maildir-utils.git/lib/mu-msg-file.c 2012-08-21 14:47:06.000000000 +0900
+@@ -468,13 +468,6 @@
+ {
+ GMimeContentType *ctype;
+ const char* charset;
+- unsigned char *cur;
+-
+- /* optimization: if the buffer is plain ascii, no conversion
+- * is done... */
+- for (cur = (unsigned char*)buffer; *cur && *cur < 0x80; ++cur);
+- if (*cur == '\0')
+- return buffer;
+
+ ctype = g_mime_object_get_content_type (GMIME_OBJECT(part));
+ g_return_val_if_fail (GMIME_IS_CONTENT_TYPE(ctype), NULL);
+@@ -484,21 +477,15 @@
+ if (charset) {
+ char *utf8;
+ utf8 = mu_str_convert_to_utf8
+- (buffer,
+- g_mime_charset_iconv_name (charset));
++ (buffer, g_mime_charset_iconv_name (charset));
+ if (utf8) {
+ g_free (buffer);
+ return utf8;
+ }
+- } else if (g_utf8_validate (buffer, -1, NULL)) {
+- /* check if the buffer is valid utf8, even if it doesn't
+- * say so explicitly... if that is the case, return it as-is */
+-
+- /* nothing to do, buffer is already utf8 */
+-
+- } else {
+- /* hmmm.... no charset at all, or conversion failed; ugly
+- * hack: replace all non-ascii chars with '.' */
++ } else if (!g_utf8_validate (buffer, -1, NULL)) {
++ /* if it's already utf8, nothing to do otherwise: no
++ charset at all, or conversion failed; ugly * hack:
++ replace all non-ascii chars with '.' */
+ mu_str_asciify_in_place (buffer);
+ }
+
Reply to: