[davmail] 01/02: depend on javamail rather than on gnumail
Alexandre Rossi
alexandre.rossi at gmail.com
Wed Aug 12 13:04:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
niol-guest pushed a commit to branch master
in repository davmail.
commit 943ebff625a07b244bab9faec5eef76f9b844363
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date: Wed Aug 12 14:41:14 2015 +0200
depend on javamail rather than on gnumail
---
debian/ant.properties | 2 +-
debian/changelog | 9 +-
debian/control | 2 +-
debian/copyright | 2 +-
debian/patches/0003-base64-enc-dec.patch | 484 ---------------------
...0004-Set-classpath-add-target-davmail-lib.patch | 15 +-
debian/patches/gnumail-fix | 39 --
debian/patches/series | 2 -
8 files changed, 19 insertions(+), 536 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index 8bc2436..9dac827 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -6,7 +6,7 @@ commons-codec = /usr/share/java/commons-codec.jar
servlet-api = /usr/share/java/servlet-api.jar
commons-httpclient = /usr/share/java/commons-httpclient.jar
htmlcleaner = /usr/share/java/htmlcleaner.jar
-gnumail = /usr/share/java/gnumail.jar
+mail = /usr/share/java/javax.mail.jar
jcifs = /usr/share/java/jcifs.jar
jackrabbit-webdav = /usr/share/java/jackrabbit-webdav.jar
woodstox-core = /usr/share/java/woodstox-core-lgpl.jar
diff --git a/debian/changelog b/debian/changelog
index 601d73f..4d8d07a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-davmail (4.3.4.2174-1) UNRELEASED; urgency=low
+davmail (4.4.0.2198-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+ * Depend on javamail rather than gnumail (to prevent some bugs).
+
+ -- Alexandre Rossi <alexandre.rossi at gmail.com> Fri, 10 Jan 2014 12:54:45 +0000
+
+davmail (4.3.4.2174-3) UNRELEASED; urgency=low
* New upstream version.
* Make java deps architecture independent.
diff --git a/debian/control b/debian/control
index 9d96775..c2fa8e2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~), default-jdk, ant, ant-optional,
javahelper (>=0.20)
Build-Depends-Indep: libcommons-codec-java, libservlet2.4-java,
libcommons-httpclient-java, libhtmlcleaner-java,
- libgnumail-java, libjcifs-java, libjackrabbit-java,
+ libmail-java, libjcifs-java, libjackrabbit-java,
liblog4j1.2-java, libwoodstox-java, libstax2-api-java,
libswt-gtk-3-java, libslf4j-java
Standards-Version: 3.9.4
diff --git a/debian/copyright b/debian/copyright
index 09bd88b..a280a7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,7 +42,7 @@ License: LGPL-2.1+ or Apache-2.0
.
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
diff --git a/debian/patches/0003-base64-enc-dec.patch b/debian/patches/0003-base64-enc-dec.patch
deleted file mode 100644
index d2d52e7..0000000
--- a/debian/patches/0003-base64-enc-dec.patch
+++ /dev/null
@@ -1,484 +0,0 @@
-From: Alexandre Rossi <alexandre.rossi at gmail.com>
-Date: Sat, 13 Apr 2013 02:50:33 +0200
-Subject: base64-enc-dec
-
-Those are missing in libgnumail-java and needed to build davmail. The
-alternative would be to depend on javamail which is now DFSG-free
-(RFP #596469, http://bugs.debian.org/596469 )
-
-Origin: javamail source code, http://kenai.com/projects/javamail/downloads
-Forwarded: not-needed
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
----
- .../mail/imap/protocol/BASE64MailboxDecoder.java | 194 +++++++++++++++
- .../mail/imap/protocol/BASE64MailboxEncoder.java | 260 ++++++++++++++++++++
- 2 files changed, 454 insertions(+)
- create mode 100644 src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
- create mode 100644 src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
-
-diff --git a/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java b/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
-new file mode 100644
-index 0000000..0f91415
---- /dev/null
-+++ b/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
-@@ -0,0 +1,194 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-+ *
-+ * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-+ *
-+ * The contents of this file are subject to the terms of either the GNU
-+ * General Public License Version 2 only ("GPL") or the Common Development
-+ * and Distribution License("CDDL") (collectively, the "License"). You
-+ * may not use this file except in compliance with the License. You can
-+ * obtain a copy of the License at
-+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-+ * or packager/legal/LICENSE.txt. See the License for the specific
-+ * language governing permissions and limitations under the License.
-+ *
-+ * When distributing the software, include this License Header Notice in each
-+ * file and include the License file at packager/legal/LICENSE.txt.
-+ *
-+ * GPL Classpath Exception:
-+ * Oracle designates this particular file as subject to the "Classpath"
-+ * exception as provided by Oracle in the GPL Version 2 section of the License
-+ * file that accompanied this code.
-+ *
-+ * Modifications:
-+ * If applicable, add the following below the License Header, with the fields
-+ * enclosed by brackets [] replaced by your own identifying information:
-+ * "Portions Copyright [year] [name of copyright owner]"
-+ *
-+ * Contributor(s):
-+ * If you wish your version of this file to be governed by only the CDDL or
-+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
-+ * elects to include this software in this distribution under the [CDDL or GPL
-+ * Version 2] license." If you don't indicate a single choice of license, a
-+ * recipient has the option to distribute your version of this file under
-+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
-+ * its licensees as provided above. However, if you add GPL Version 2 code
-+ * and therefore, elected the GPL Version 2 license, then the option applies
-+ * only if the new code is made subject to such option by the copyright
-+ * holder.
-+ */
-+
-+package com.sun.mail.imap.protocol;
-+
-+import java.text.StringCharacterIterator;
-+import java.text.CharacterIterator;
-+
-+/**
-+ * See the BASE64MailboxEncoder for a description of the RFC2060 and how
-+ * mailbox names should be encoded. This class will do the correct decoding
-+ * for mailbox names.
-+ *
-+ * @author Christopher Cotton
-+ */
-+
-+public class BASE64MailboxDecoder {
-+
-+ public static String decode(String original) {
-+ if (original == null || original.length() == 0)
-+ return original;
-+
-+ boolean changedString = false;
-+ int copyTo = 0;
-+ // it will always be less than the original
-+ char[] chars = new char[original.length()];
-+ StringCharacterIterator iter = new StringCharacterIterator(original);
-+
-+ for(char c = iter.first(); c != CharacterIterator.DONE;
-+ c = iter.next()) {
-+
-+ if (c == '&') {
-+ changedString = true;
-+ copyTo = base64decode(chars, copyTo, iter);
-+ } else {
-+ chars[copyTo++] = c;
-+ }
-+ }
-+
-+ // now create our string from the char array
-+ if (changedString) {
-+ return new String(chars, 0, copyTo);
-+ } else {
-+ return original;
-+ }
-+ }
-+
-+
-+ protected static int base64decode(char[] buffer, int offset,
-+ CharacterIterator iter) {
-+ boolean firsttime = true;
-+ int leftover = -1;
-+
-+ while(true) {
-+ // get the first byte
-+ byte orig_0 = (byte) iter.next();
-+ if (orig_0 == -1) break; // no more chars
-+ if (orig_0 == '-') {
-+ if (firsttime) {
-+ // means we got the string "&-" which is turned into a "&"
-+ buffer[offset++] = '&';
-+ }
-+ // we are done now
-+ break;
-+ }
-+ firsttime = false;
-+
-+ // next byte
-+ byte orig_1 = (byte) iter.next();
-+ if (orig_1 == -1 || orig_1 == '-')
-+ break; // no more chars, invalid base64
-+
-+ byte a, b, current;
-+ a = pem_convert_array[orig_0 & 0xff];
-+ b = pem_convert_array[orig_1 & 0xff];
-+ // The first decoded byte
-+ current = (byte)(((a << 2) & 0xfc) | ((b >>> 4) & 3));
-+
-+ // use the leftover to create a Unicode Character (2 bytes)
-+ if (leftover != -1) {
-+ buffer[offset++] = (char)(leftover << 8 | (current & 0xff));
-+ leftover = -1;
-+ } else {
-+ leftover = current & 0xff;
-+ }
-+
-+ byte orig_2 = (byte) iter.next();
-+ if (orig_2 == '=') { // End of this BASE64 encoding
-+ continue;
-+ } else if (orig_2 == -1 || orig_2 == '-') {
-+ break; // no more chars
-+ }
-+
-+ // second decoded byte
-+ a = b;
-+ b = pem_convert_array[orig_2 & 0xff];
-+ current = (byte)(((a << 4) & 0xf0) | ((b >>> 2) & 0xf));
-+
-+ // use the leftover to create a Unicode Character (2 bytes)
-+ if (leftover != -1) {
-+ buffer[offset++] = (char)(leftover << 8 | (current & 0xff));
-+ leftover = -1;
-+ } else {
-+ leftover = current & 0xff;
-+ }
-+
-+ byte orig_3 = (byte) iter.next();
-+ if (orig_3 == '=') { // End of this BASE64 encoding
-+ continue;
-+ } else if (orig_3 == -1 || orig_3 == '-') {
-+ break; // no more chars
-+ }
-+
-+ // The third decoded byte
-+ a = b;
-+ b = pem_convert_array[orig_3 & 0xff];
-+ current = (byte)(((a << 6) & 0xc0) | (b & 0x3f));
-+
-+ // use the leftover to create a Unicode Character (2 bytes)
-+ if (leftover != -1) {
-+ buffer[offset++] = (char)(leftover << 8 | (current & 0xff));
-+ leftover = -1;
-+ } else {
-+ leftover = current & 0xff;
-+ }
-+ }
-+
-+ return offset;
-+ }
-+
-+ /**
-+ * This character array provides the character to value map
-+ * based on RFC1521, but with the modification from RFC2060
-+ * which changes the '/' to a ','.
-+ */
-+
-+ // shared with BASE64MailboxEncoder
-+ static final char pem_array[] = {
-+ 'A','B','C','D','E','F','G','H', // 0
-+ 'I','J','K','L','M','N','O','P', // 1
-+ 'Q','R','S','T','U','V','W','X', // 2
-+ 'Y','Z','a','b','c','d','e','f', // 3
-+ 'g','h','i','j','k','l','m','n', // 4
-+ 'o','p','q','r','s','t','u','v', // 5
-+ 'w','x','y','z','0','1','2','3', // 6
-+ '4','5','6','7','8','9','+',',' // 7
-+ };
-+
-+ private static final byte pem_convert_array[] = new byte[256];
-+
-+ static {
-+ for (int i = 0; i < 255; i++)
-+ pem_convert_array[i] = -1;
-+ for(int i = 0; i < pem_array.length; i++)
-+ pem_convert_array[pem_array[i]] = (byte) i;
-+ }
-+}
-diff --git a/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java b/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
-new file mode 100644
-index 0000000..c2021cc
---- /dev/null
-+++ b/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
-@@ -0,0 +1,260 @@
-+/*
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-+ *
-+ * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
-+ *
-+ * The contents of this file are subject to the terms of either the GNU
-+ * General Public License Version 2 only ("GPL") or the Common Development
-+ * and Distribution License("CDDL") (collectively, the "License"). You
-+ * may not use this file except in compliance with the License. You can
-+ * obtain a copy of the License at
-+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
-+ * or packager/legal/LICENSE.txt. See the License for the specific
-+ * language governing permissions and limitations under the License.
-+ *
-+ * When distributing the software, include this License Header Notice in each
-+ * file and include the License file at packager/legal/LICENSE.txt.
-+ *
-+ * GPL Classpath Exception:
-+ * Oracle designates this particular file as subject to the "Classpath"
-+ * exception as provided by Oracle in the GPL Version 2 section of the License
-+ * file that accompanied this code.
-+ *
-+ * Modifications:
-+ * If applicable, add the following below the License Header, with the fields
-+ * enclosed by brackets [] replaced by your own identifying information:
-+ * "Portions Copyright [year] [name of copyright owner]"
-+ *
-+ * Contributor(s):
-+ * If you wish your version of this file to be governed by only the CDDL or
-+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
-+ * elects to include this software in this distribution under the [CDDL or GPL
-+ * Version 2] license." If you don't indicate a single choice of license, a
-+ * recipient has the option to distribute your version of this file under
-+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
-+ * its licensees as provided above. However, if you add GPL Version 2 code
-+ * and therefore, elected the GPL Version 2 license, then the option applies
-+ * only if the new code is made subject to such option by the copyright
-+ * holder.
-+ */
-+
-+package com.sun.mail.imap.protocol;
-+
-+import java.io.*;
-+
-+
-+/**
-+ *
-+ *
-+ from RFC2060
-+
-+5.1.3. Mailbox International Naming Convention
-+
-+ By convention, international mailbox names are specified using a
-+ modified version of the UTF-7 encoding described in [UTF-7]. The
-+ purpose of these modifications is to correct the following problems
-+ with UTF-7:
-+
-+ 1) UTF-7 uses the "+" character for shifting; this conflicts with
-+ the common use of "+" in mailbox names, in particular USENET
-+ newsgroup names.
-+
-+ 2) UTF-7's encoding is BASE64 which uses the "/" character; this
-+ conflicts with the use of "/" as a popular hierarchy delimiter.
-+
-+ 3) UTF-7 prohibits the unencoded usage of "\"; this conflicts with
-+ the use of "\" as a popular hierarchy delimiter.
-+
-+ 4) UTF-7 prohibits the unencoded usage of "~"; this conflicts with
-+ the use of "~" in some servers as a home directory indicator.
-+
-+ 5) UTF-7 permits multiple alternate forms to represent the same
-+ string; in particular, printable US-ASCII chararacters can be
-+ represented in encoded form.
-+
-+ In modified UTF-7, printable US-ASCII characters except for "&"
-+ represent themselves; that is, characters with octet values 0x20-0x25
-+ and 0x27-0x7e. The character "&" (0x26) is represented by the two-
-+ octet sequence "&-".
-+
-+ All other characters (octet values 0x00-0x1f, 0x7f-0xff, and all
-+ Unicode 16-bit octets) are represented in modified BASE64, with a
-+ further modification from [UTF-7] that "," is used instead of "/".
-+ Modified BASE64 MUST NOT be used to represent any printing US-ASCII
-+ character which can represent itself.
-+
-+ "&" is used to shift to modified BASE64 and "-" to shift back to US-
-+ ASCII. All names start in US-ASCII, and MUST end in US-ASCII (that
-+ is, a name that ends with a Unicode 16-bit octet MUST end with a "-
-+ ").
-+
-+
-+
-+
-+
-+Crispin Standards Track [Page 15]
-+
-+RFC 2060 IMAP4rev1 December 1996
-+
-+
-+ For example, here is a mailbox name which mixes English, Japanese,
-+ and Chinese text: ~peter/mail/&ZeVnLIqe-/&U,BTFw-
-+
-+
-+ * This class will do the correct Encoding for the IMAP mailboxes
-+ *
-+ * @author Christopher Cotton
-+ */
-+
-+public class BASE64MailboxEncoder {
-+ protected byte[] buffer = new byte[4];
-+ protected int bufsize = 0;
-+ protected boolean started = false;
-+ protected Writer out = null;
-+
-+
-+ public static String encode(String original) {
-+ BASE64MailboxEncoder base64stream = null;
-+ char origchars[] = original.toCharArray();
-+ int length = origchars.length;
-+ boolean changedString = false;
-+ CharArrayWriter writer = new CharArrayWriter(length);
-+
-+ // loop over all the chars
-+ for(int index = 0; index < length; index++) {
-+ char current = origchars[index];
-+
-+ // octets in the range 0x20-0x25,0x27-0x7e are themselves
-+ // 0x26 "&" is represented as "&-"
-+ if (current >= 0x20 && current <= 0x7e) {
-+ if (base64stream != null) {
-+ base64stream.flush();
-+ }
-+
-+ if (current == '&') {
-+ changedString = true;
-+ writer.write('&');
-+ writer.write('-');
-+ } else {
-+ writer.write(current);
-+ }
-+ } else {
-+
-+ // use a B64MailboxEncoder to write out the other bytes
-+ // as a modified BASE64. The stream will write out
-+ // the beginning '&' and the ending '-' which is part
-+ // of every encoding.
-+
-+ if (base64stream == null) {
-+ base64stream = new BASE64MailboxEncoder(writer);
-+ changedString = true;
-+ }
-+
-+ base64stream.write(current);
-+ }
-+ }
-+
-+
-+ if (base64stream != null) {
-+ base64stream.flush();
-+ }
-+
-+ if (changedString) {
-+ return writer.toString();
-+ } else {
-+ return original;
-+ }
-+ }
-+
-+
-+ /**
-+ * Create a BASE64 encoder
-+ */
-+ public BASE64MailboxEncoder(Writer what) {
-+ out = what;
-+ }
-+
-+ public void write(int c) {
-+ try {
-+ // write out the initial character if this is the first time
-+ if (!started) {
-+ started = true;
-+ out.write('&');
-+ }
-+
-+ // we write each character as a 2 byte unicode character
-+ buffer[bufsize++] = (byte) (c >> 8);
-+ buffer[bufsize++] = (byte) (c & 0xff);
-+
-+ if (bufsize >= 3) {
-+ encode();
-+ bufsize -= 3;
-+ }
-+ } catch (IOException e) {
-+ //e.printStackTrace();
-+ }
-+ }
-+
-+
-+ public void flush() {
-+ try {
-+ // flush any bytes we have
-+ if (bufsize > 0) {
-+ encode();
-+ bufsize = 0;
-+ }
-+
-+ // write the terminating character of the encoding
-+ if (started) {
-+ out.write('-');
-+ started = false;
-+ }
-+ } catch (IOException e) {
-+ //e.printStackTrace();
-+ }
-+ }
-+
-+
-+ protected void encode() throws IOException {
-+ byte a, b, c;
-+ if (bufsize == 1) {
-+ a = buffer[0];
-+ b = 0;
-+ c = 0;
-+ out.write(pem_array[(a >>> 2) & 0x3F]);
-+ out.write(pem_array[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
-+ // no padding characters are written
-+ } else if (bufsize == 2) {
-+ a = buffer[0];
-+ b = buffer[1];
-+ c = 0;
-+ out.write(pem_array[(a >>> 2) & 0x3F]);
-+ out.write(pem_array[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
-+ out.write(pem_array[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
-+ // no padding characters are written
-+ } else {
-+ a = buffer[0];
-+ b = buffer[1];
-+ c = buffer[2];
-+ out.write(pem_array[(a >>> 2) & 0x3F]);
-+ out.write(pem_array[((a << 4) & 0x30) + ((b >>> 4) & 0xf)]);
-+ out.write(pem_array[((b << 2) & 0x3c) + ((c >>> 6) & 0x3)]);
-+ out.write(pem_array[c & 0x3F]);
-+
-+ // copy back the extra byte
-+ if (bufsize == 4)
-+ buffer[0] = buffer[3];
-+ }
-+ }
-+
-+ private final static char pem_array[] = {
-+ 'A','B','C','D','E','F','G','H', // 0
-+ 'I','J','K','L','M','N','O','P', // 1
-+ 'Q','R','S','T','U','V','W','X', // 2
-+ 'Y','Z','a','b','c','d','e','f', // 3
-+ 'g','h','i','j','k','l','m','n', // 4
-+ 'o','p','q','r','s','t','u','v', // 5
-+ 'w','x','y','z','0','1','2','3', // 6
-+ '4','5','6','7','8','9','+',',' // 7
-+ };
-+}
diff --git a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
index 7bb833e..3989969 100644
--- a/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -8,10 +8,10 @@ Subject: Set classpath, add target davmail-lib
Index: davmail.git/build.xml
===================================================================
---- davmail.git.orig/build.xml 2013-10-31 14:52:28.861222318 +0100
-+++ davmail.git/build.xml 2013-10-31 14:52:28.841222319 +0100
-@@ -3,10 +3,17 @@
- <property name="version" value="4.3.4"/>
+--- davmail.git.orig/build.xml 2014-01-11 20:18:54.896869323 +0100
++++ davmail.git/build.xml 2014-01-11 20:43:03.480939431 +0100
+@@ -3,10 +3,18 @@
+ <property name="version" value="4.4.0"/>
<path id="classpath">
- <pathelement location="classes"/>
@@ -22,17 +22,18 @@ Index: davmail.git/build.xml
+ <pathelement location="${servlet-api}" />
+ <pathelement location="${commons-httpclient}" />
+ <pathelement location="${htmlcleaner}" />
-+ <pathelement location="${gnumail}" />
++ <pathelement location="${mail}" />
+ <pathelement location="${jcifs}" />
+ <pathelement location="${jackrabbit-webdav}" />
+ <pathelement location="${woodstox-core}" />
+ <pathelement location="${stax2-api}" />
+ <pathelement location="${swt}" />
+ <pathelement location="${slf4j-api}" />
++ <pathelement location="${slf4j-simple}" />
</path>
<target name="clean">
-@@ -282,34 +289,13 @@
+@@ -282,34 +290,13 @@
</target>
@@ -69,7 +70,7 @@ Index: davmail.git/build.xml
</pathconvert>
<jar basedir="target/classes" destfile="dist/davmail.jar">
<manifest>
-@@ -322,6 +308,9 @@
+@@ -322,6 +309,9 @@
</section>
</manifest>
</jar>
diff --git a/debian/patches/gnumail-fix b/debian/patches/gnumail-fix
deleted file mode 100644
index be0f7ce..0000000
--- a/debian/patches/gnumail-fix
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Handle gnumail differences with javamail.
-Forwarded: not-needed
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-
-Index: davmail.git/src/java/davmail/imap/ImapConnection.java
-===================================================================
---- davmail.git.orig/src/java/davmail/imap/ImapConnection.java 2013-11-06 18:40:32.580149759 +0100
-+++ davmail.git/src/java/davmail/imap/ImapConnection.java 2013-11-06 18:53:50.860188393 +0100
-@@ -846,6 +846,12 @@
- String partIndexString = StringUtil.getToken(param, "[", "]");
- if (("".equals(partIndexString) || partIndexString == null) && !"RFC822.HEADER".equals(param)) {
- // write message with headers
-+ Enumeration headerEnumeration = messageWrapper.getMatchingHeaderLines(null);
-+ while (headerEnumeration.hasMoreElements()) {
-+ baos.write(((String) headerEnumeration.nextElement()).getBytes("UTF-8"));
-+ baos.write(13);
-+ baos.write(10);
-+ }
- partOutputStream = new PartialOutputStream(baos, startIndex, maxSize);
- partInputStream = messageWrapper.getRawInputStream();
- } else if ("TEXT".equals(partIndexString)) {
-@@ -861,10 +867,6 @@
- baos.write(message.contentClass.getBytes("UTF-8"));
- baos.write(13);
- baos.write(10);
-- } else if (requestedHeaders == null) {
-- // load message and write all headers
-- partOutputStream = new PartOutputStream(baos, true, false, startIndex, maxSize);
-- partInputStream = messageWrapper.getRawInputStream();
- } else {
- Enumeration headerEnumeration = messageWrapper.getMatchingHeaderLines(requestedHeaders);
- while (headerEnumeration.hasMoreElements()) {
-@@ -1945,4 +1947,4 @@
- }
- }
-
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 271803d..7724478 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
0001-no-windows-service.patch
0002-no-osx-tray.patch
-0003-base64-enc-dec.patch
0004-Set-classpath-add-target-davmail-lib.patch
0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
-gnumail-fix
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/davmail.git
More information about the pkg-java-commits
mailing list