Bug#685658: unblock: maildir-utils/0.9.8.5-3
Hi Norbert, On Fri, Aug 24, 2012 at 09:03:29 +0900, Norbert Preining wrote: Hi Cyril, On Do, 23 Aug 2012, Cyril Brulebois wrote: 319 files changed, 37796 insertions(+), 31727 deletions(-) :-( Other team members might have a different opinion, but it looks to me like those changes are very much too important for me/us to consider reviewing/unblocking at this point, sorry. I see your point. In this case is there anything you would suggest? I could backort the changes that fixes the encoding issues to the version in testing, but that would need introduction of epochs (something I dislike). If I go this way, I want to make sure that it will be accepted into testing, otherwise I end up with useless introduction of epochs for nothing. THe idea would be to just apply the patch I sent you (from -1 to -3) plus one small one in the configure that relaxes the check for some library component (also upstream). Anyother ideas, suggestions? It's not clear to me why you're saying an epoch would be necessary. The fix you sent could be applied to the version in testing and uploaded there directly. If you could prepare that upload and send us a final debdiff that would be great. Cheers, Julien signature.asc Description: Digital signature
Bug#685658: unblock: maildir-utils/0.9.8.5-3
Hi Julien, hi all,
On Mi, 10 Okt 2012, Julien Cristau wrote:
It's not clear to me why you're saying an epoch would be necessary. The
fix you sent could be applied to the version in testing and uploaded
there directly. If you could prepare that upload and send us a final
debdiff that would be great.
Ok, so *how* would I name the new version? ANd how do I upload
directly to testing?
I have prepared a package with
maildir-utils (0.9.8.4-4) testing; urgency=low
so the release lies above the version in testing, but still below
the version in unstable.
The full diff between the source package in testing and the one
prepared is here:
diff --git a/debian/changelog b/debian/changelog
index b848fab..fb202fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+maildir-utils (0.9.8.4-4) testing; 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 prein...@debian.org Thu, 11 Oct 2012 07:32:09 +0900
+
maildir-utils (0.9.8.4-3) unstable; urgency=high
* conflict with mailutils 1:2.99.97-3 (same files) (Closes: #678484)
diff --git a/debian/patches/series b/debian/patches/series
index 61df53d..8090f3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ fix-mug2-build
fix-manpages
disable-emacs-compile
upstream-xapian-ignore-third-digit
+upstream_4fa0c57d_iso-2022-jp
diff --git a/debian/patches/upstream_4fa0c57d_iso-2022-jp
b/debian/patches/upstream_4fa0c57d_iso-2022-jp
new file mode 100644
index 000..b7dfff2
--- /dev/null
+++ b/debian/patches/upstream_4fa0c57d_iso-2022-jp
@@ -0,0 +1,47 @@
+---
+ src/mu-msg-file.c | 23 +--
+ 1 file changed, 5 insertions(+), 18 deletions(-)
+
+--- maildir-utils.git.orig/src/mu-msg-file.c
maildir-utils.git/src/mu-msg-file.c
+@@ -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);
+ }
+
I am not sure how to upload this beast, whether the version number
and distribution is fine, so please let me know.
Best wishes
Norbert
Norbert Preiningpreining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
DORRIDGE (n.)
Technical term for one of the lame excuses written in very small print
on the side of packets of food or washing powder to explain why
there's hardly anything inside. Examples include 'Contents may have
settled in transit' and 'To keep each biscuit fresh they have been
individually wrapped in silver paper and cellophane and separated with
corrugated lining, a cardboard flap, and heavy industrial tyres'.
--- Douglas Adams, The Meaning of Liff
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20121010224018.gb16...@gamma.logic.tuwien.ac.at
Bug#685658: unblock: maildir-utils/0.9.8.5-3
Control: tags -1 + confirmed On Thu, 2012-10-11 at 07:40 +0900, Norbert Preining wrote: On Mi, 10 Okt 2012, Julien Cristau wrote: It's not clear to me why you're saying an epoch would be necessary. The fix you sent could be applied to the version in testing and uploaded there directly. If you could prepare that upload and send us a final debdiff that would be great. Ok, so *how* would I name the new version? ANd how do I upload directly to testing? I have prepared a package with maildir-utils (0.9.8.4-4) testing; urgency=low so the release lies above the version in testing, but still below the version in unstable. The answer to your second question is in the changelog snippet you posted :-) - use testing, wheezy or testing-proposed-updates as the distribution. In terms of versions the above would work, although 0.9.8.4-3+deb7u1 would more more conventional, to explicitly indicate that the upload was made out of series. The diff looks okay to me. Please feel free to go ahead with the upload; thanks. Regards, Adam -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1349909627.1655.29.ca...@jacala.jungle.funky-badger.org
Processed: Re: Bug#685658: unblock: maildir-utils/0.9.8.5-3
Processing control commands: tags -1 + confirmed Bug #685658 [release.debian.org] unblock: maildir-utils/0.9.8.5-3 Added tag(s) confirmed. -- 685658: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685658 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.b685658.134990971928560.transcr...@bugs.debian.org
Bug#685658: unblock: maildir-utils/0.9.8.5-3
Hi Adam,
thanks for the prompt reply.
On Mi, 10 Okt 2012, Adam D. Barratt wrote:
The answer to your second question is in the changelog snippet you
posted :-) - use testing, wheezy or testing-proposed-updates as
the distribution.
Ok, thanks for teaching me that. I would have expected that this
will be automatically rejected ;-)
In terms of versions the above would work, although 0.9.8.4-3+deb7u1
would more more conventional, to explicitly indicate that the upload was
made out of series.
Ok, changed the version number to what you suggested.
I am building the package now in a clean testing chroot (cowbuilder)
and will upload after that.
Best wishes
Norbert
Norbert Preiningpreining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
HASSOP (n.)
The pocket down the back of an armchair used for storing two-shilling
bits and pieces of Lego.
--- Douglas Adams, The Meaning of Liff
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20121010230728.ge16...@gamma.logic.tuwien.ac.at
Bug#685658: unblock: maildir-utils/0.9.8.5-3
Hi Norbert, Norbert Preining prein...@logic.at (23/08/2012): 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. […] 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. ewww indeed! 319 files changed, 37796 insertions(+), 31727 deletions(-) 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 Other team members might have a different opinion, but it looks to me like those changes are very much too important for me/us to consider reviewing/unblocking at this point, sorry. Mraw, KiBi. signature.asc Description: Digital signature
Bug#685658: unblock: maildir-utils/0.9.8.5-3
Hi Cyril,
On Do, 23 Aug 2012, Cyril Brulebois wrote:
319 files changed, 37796 insertions(+), 31727 deletions(-)
:-(
Other team members might have a different opinion, but it looks to me
like those changes are very much too important for me/us to consider
reviewing/unblocking at this point, sorry.
I see your point.
In this case is there anything you would suggest? I could backort
the changes that fixes the encoding issues to the version in testing,
but that would need introduction of epochs (something I dislike).
If I go this way, I want to make sure that it will be accepted
into testing, otherwise I end up with useless introduction of
epochs for nothing. THe idea would be to just apply the patch
I sent you (from -1 to -3) plus one small one in the configure
that relaxes the check for some library component (also upstream).
Anyother ideas, suggestions?
Best wishes
Norbert
Norbert Preiningpreining@{jaist.ac.jp, logic.at, debian.org}
JAIST, Japan TeX Live Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
MAARUIG (n.)
The inexpressible horror experienced on walking up in the morning and
remembering that you are Andy Stewart.
--- Douglas Adams, The Meaning of Liff
--
To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120824000329.ge9...@gamma.logic.tuwien.ac.at
Bug#685658: unblock: maildir-utils/0.9.8.5-3
Package: release.debian.org
Severity: normal
User: release.debian@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.0 +0900
+++ maildir-utils-0.9.8.5/debian/changelog 2012-08-23 09:23:02.0 +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 prein...@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 prein...@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.0 +0900
+++ maildir-utils-0.9.8.5/debian/control 2012-08-23 09:22:28.0 +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
