summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-22 19:53:19 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-22 19:53:19 +0000
commit0cd4fa28822f91b237d83293046c96a280d14325 (patch)
treec23ced967c2c381c11cb91f1cc3308873533e319 /mail-client/mailody
parentVersion bump, bug #162047 (diff)
downloadgentoo-2-0cd4fa28822f91b237d83293046c96a280d14325.tar.gz
gentoo-2-0cd4fa28822f91b237d83293046c96a280d14325.tar.bz2
gentoo-2-0cd4fa28822f91b237d83293046c96a280d14325.zip
Add patch to fix To: appearing as sender address improperly, from upstream, and remove old versions.
(Portage version: 2.1.2-r1)
Diffstat (limited to 'mail-client/mailody')
-rw-r--r--mail-client/mailody/ChangeLog9
-rw-r--r--mail-client/mailody/files/digest-mailody-0.2.03
-rw-r--r--mail-client/mailody/files/digest-mailody-0.2.0_rc13
-rw-r--r--mail-client/mailody/files/digest-mailody-0.3.03
-rw-r--r--mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch95
-rw-r--r--mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch52
-rw-r--r--mail-client/mailody/mailody-0.2.0.ebuild23
-rw-r--r--mail-client/mailody/mailody-0.2.0_rc1.ebuild25
-rw-r--r--mail-client/mailody/mailody-0.3.0.ebuild23
-rw-r--r--mail-client/mailody/mailody-0.4.0_rc1.ebuild4
10 files changed, 63 insertions, 177 deletions
diff --git a/mail-client/mailody/ChangeLog b/mail-client/mailody/ChangeLog
index 97b4592f5191..ed535e8d2b57 100644
--- a/mail-client/mailody/ChangeLog
+++ b/mail-client/mailody/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for mail-client/mailody
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/ChangeLog,v 1.5 2007/01/22 18:30:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/ChangeLog,v 1.6 2007/01/22 19:53:19 flameeyes Exp $
+
+ 22 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+ -files/mailody-0.2.0_rc1-dovecot.patch,
+ +files/mailody-0.4.0_rc1-fix-parsing.patch, -mailody-0.2.0_rc1.ebuild,
+ -mailody-0.2.0.ebuild, -mailody-0.3.0.ebuild, mailody-0.4.0_rc1.ebuild:
+ Add patch to fix To: appearing as sender address improperly, from upstream,
+ and remove old versions.
*mailody-0.4.0_rc1 (22 Jan 2007)
diff --git a/mail-client/mailody/files/digest-mailody-0.2.0 b/mail-client/mailody/files/digest-mailody-0.2.0
deleted file mode 100644
index 36a86e3ff64e..000000000000
--- a/mail-client/mailody/files/digest-mailody-0.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7256f7ae5198f8f0a12c3ea837a96960 mailody-0.2.0.tar.bz2 641347
-RMD160 5d6b703a151f148a70a6db0904a5d9ac59c1576c mailody-0.2.0.tar.bz2 641347
-SHA256 39e12815c691b2bf3e70ad9df41b87272554147007fc3c446febd228600269c3 mailody-0.2.0.tar.bz2 641347
diff --git a/mail-client/mailody/files/digest-mailody-0.2.0_rc1 b/mail-client/mailody/files/digest-mailody-0.2.0_rc1
deleted file mode 100644
index 4bee0472b5fd..000000000000
--- a/mail-client/mailody/files/digest-mailody-0.2.0_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7837d83c82ddb13b5f6e1e8b72d993bb mailody-0.2.0-rc1.tar.bz2 632373
-RMD160 450fc2192eaab5c751970fbb45c69d835af52f38 mailody-0.2.0-rc1.tar.bz2 632373
-SHA256 e7f5069e41d252c9ef72d5c2f0cdb7d4b257d2ee9e79b6017f96adf53527e80f mailody-0.2.0-rc1.tar.bz2 632373
diff --git a/mail-client/mailody/files/digest-mailody-0.3.0 b/mail-client/mailody/files/digest-mailody-0.3.0
deleted file mode 100644
index 799759d69683..000000000000
--- a/mail-client/mailody/files/digest-mailody-0.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e0d5de3739f38da4998c6155d80f12e mailody-0.3.0.tar.bz2 659394
-RMD160 3e4f581c6dc05c0d1e97ae757467917443887d5a mailody-0.3.0.tar.bz2 659394
-SHA256 9e7f938bb1bea6d8a24e957e1171ae7b8b41efa268eca7e8d5f1dd4629ee8dd2 mailody-0.3.0.tar.bz2 659394
diff --git a/mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch b/mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch
deleted file mode 100644
index 86cf57eb5b1a..000000000000
--- a/mail-client/mailody/files/mailody-0.2.0_rc1-dovecot.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Index: mailody/mailody/src/imap.cpp
-===================================================================
---- mailody/mailody/src/imap.cpp (revision 604932)
-+++ mailody/mailody/src/imap.cpp (working copy)
-@@ -392,51 +392,72 @@
- //|* 1 FETCH (UID 1 BODY[HEADER.FIELDS ("FROM" "SUBJECT" "DATE")] {148}|
- // Cyrus:
- //|* 1 FETCH (UID 26133 BODY[HEADER.FIELDS (FROM SUBJECT DATE)] {139}|
-+ // Dovecot:
-+ //|* 1 FETCH (RFC822.SIZE 8609 UID 2 BODY[HEADER.FIELDS (FROM TO CC SUBJECT DATE IN-REPLY-TO MESSAGE-ID)] {337}
-
-- QRegExp rx;
-+ QRegExp rx0;
-+ QRegExp rx1;
-+ QRegExp rx2;
- if (m_currentQueueItem.state() == Queue::GetHeaders)
-- rx.setPattern("UID (\\d*) RFC822.SIZE (\\d*)"
-- + QRegExp::escape(" BODY[HEADER.FIELDS ")
-+ {
-+ rx0.setPattern("UID (\\d*) ");
-+ rx1.setPattern("RFC822.SIZE (\\d*) ");
-+ rx2.setPattern( QRegExp::escape(" BODY[HEADER.FIELDS ")
- + "\\(\"?FROM\"? \"?TO\"? \"?CC\"? "
- + "\"?SUBJECT\"? \"?DATE\"? \"?IN-REPLY-TO\"? "
- + "\"?MESSAGE-ID\"?\\)\\] "
- + QRegExp::escape("{") + "(\\d*)" + QRegExp::escape("}"));
-+ }
- else
-- rx.setPattern("UID (\\d*)" + QRegExp::escape(" BODY[] ")
-+ {
-+ rx0.setPattern("UID (\\d*)");
-+ rx2.setPattern(QRegExp::escape(" BODY[] ")
- + QRegExp::escape("{") + "(\\d*)" + QRegExp::escape("}"));
-+ }
-
- m_db->beginTransaction();
- QString r = received;
- QStringList headersToSend;
-- while (rx.search(r.stripWhiteSpace()) != -1)
-+
-+ while (rx0.search(r.stripWhiteSpace()) != -1)
- {
-- int uid = rx.cap(1).toInt();
-
-+ if ( rx2.search(r.stripWhiteSpace()) == -1)
-+ {
-+ emit statusError(i18n("Retrieving failed"));
-+ return;
-+ }
-+
-+ int uid = rx0.cap(1).toInt();
-+
- QString size;
-- int expectedLength;
-- if (m_currentQueueItem.state() == Queue::GetHeaders)
-+ if (m_currentQueueItem.state() == Queue::GetHeaders &&
-+ rx1.search(r.stripWhiteSpace()) != -1)
- {
-- size = "Size: " + rx.cap(2);
-- expectedLength = rx.cap(3).toInt();
-+ size = "Size: " + rx1.cap(1);
- }
-- else
-- expectedLength = rx.cap(2).toInt();
-
-+ int expectedLength = rx2.cap(1).toInt();
-+
- int i = r.find("}")+1;
- QString text = r.mid(i, expectedLength);
-
- if (m_currentQueueItem.state() == Queue::GetHeaders)
- {
-- text += size;
-+ text.append("\r\n");
-+ text.append(size);
- // kdDebug() << "UID: " << uid
-- // << " mb: " << m_currentQueueItem.mailbox()
-- // << "text" << text
-- // << endl;
-+ // << " mb: " << m_currentQueueItem.mailbox()
-+ // << " size: " << size
-+ // << " expect: " << expectedLength
-+ // << " found: " << i
-+ // << " text: " << text
-+ // << endl;
-
-- headersToSend.append(rx.cap(1));
-+ headersToSend.append(rx0.cap(1));
- headersToSend.append(m_currentQueueItem.mailbox());
- headersToSend.append(text);
-- headersToSend.append(m_db->getFlags(rx.cap(1).toInt(),
-+ headersToSend.append(m_db->getFlags(uid,
- m_currentQueueItem.mailbox()));
-
- if (text.isEmpty()) \ No newline at end of file
diff --git a/mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch b/mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch
new file mode 100644
index 000000000000..d40a79e75c2c
--- /dev/null
+++ b/mail-client/mailody/files/mailody-0.4.0_rc1-fix-parsing.patch
@@ -0,0 +1,52 @@
+Index: src/messagedata.cpp
+===================================================================
+--- mailody/src/messagedata.cpp (revision 626296)
++++ mailody/src/messagedata.cpp (revision 626297)
+@@ -114,19 +114,19 @@
+ // a case sensitive compare.
+ QString line = (*it).lower().stripWhiteSpace();
+
+- if (line.startsWith("size"))
+- m_size = (*it).section(' ',1).stripWhiteSpace().toInt();
++ if (line.startsWith("size:"))
++ m_size = (*it).section(':',1).stripWhiteSpace().toInt();
+
+ else if (line.startsWith("subject"))
+ {
+ const char* usedCS;
+- QString t = (*it).section(' ',1).stripWhiteSpace();
++ QString t = (*it).section(':',1).stripWhiteSpace();
+ m_subject =
+ KMime::decodeRFC2047String(t.local8Bit(), &usedCS, "", false);
+ }
+- else if (line.startsWith("from"))
++ else if (line.startsWith("from:"))
+ {
+- QString t = (*it).section(' ',1).stripWhiteSpace();
++ QString t = (*it).section(':',1).stripWhiteSpace();
+ const char* usedCS;
+ t = KMime::decodeRFC2047String(t.local8Bit(), &usedCS, "", false);
+ if (Global::myEmail(t))
+@@ -134,11 +134,11 @@
+ m_sender = t;
+ parseEmail(m_sender);
+ }
+- else if (m_sender.isEmpty() && line.startsWith("to"))
++ else if (m_sender.isEmpty() && line.startsWith("to:"))
+ {
+ // If there is no From address use the To address...
+ const char* usedCS;
+- QString t = (*it).section(' ',1).stripWhiteSpace();
++ QString t = (*it).section(':',1).stripWhiteSpace();
+ m_sender =
+ KMime::decodeRFC2047String(t.local8Bit(), &usedCS, "", false);
+ parseEmail(m_sender);
+@@ -428,7 +428,7 @@
+ }
+
+ // Maybe there is a: toma <toma@omat.nl>
+- else if ((start=email.find("<"))!=-1)
++ else if ((start=email.find("<"))!=-1 && start > 2)
+ {
+ email = email.mid(0,start);
+ return;
diff --git a/mail-client/mailody/mailody-0.2.0.ebuild b/mail-client/mailody/mailody-0.2.0.ebuild
deleted file mode 100644
index cd3479ee27d6..000000000000
--- a/mail-client/mailody/mailody-0.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.2.0.ebuild,v 1.1 2006/12/09 18:12:13 flameeyes Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="IMAP mail client for KDE"
-HOMEPAGE="http://www.mailody.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="=dev-db/sqlite-3*
- app-crypt/qca-tls"
-
-S="${WORKDIR}/${MY_P}"
-
-need-kde 3.5
diff --git a/mail-client/mailody/mailody-0.2.0_rc1.ebuild b/mail-client/mailody/mailody-0.2.0_rc1.ebuild
deleted file mode 100644
index 98f45419a208..000000000000
--- a/mail-client/mailody/mailody-0.2.0_rc1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.2.0_rc1.ebuild,v 1.2 2006/11/26 15:17:00 betelgeuse Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="IMAP mail client for KDE"
-HOMEPAGE="http://www.mailody.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="=dev-db/sqlite-3*
- app-crypt/qca-tls"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES="${FILESDIR}/${P}-dovecot.patch"
-
-need-kde 3.5
diff --git a/mail-client/mailody/mailody-0.3.0.ebuild b/mail-client/mailody/mailody-0.3.0.ebuild
deleted file mode 100644
index 4a16b66cb970..000000000000
--- a/mail-client/mailody/mailody-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.3.0.ebuild,v 1.1 2006/12/24 16:03:44 flameeyes Exp $
-
-inherit kde
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="IMAP mail client for KDE"
-HOMEPAGE="http://www.mailody.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="=dev-db/sqlite-3*
- app-crypt/qca-tls"
-
-S="${WORKDIR}/${MY_P}"
-
-need-kde 3.5
diff --git a/mail-client/mailody/mailody-0.4.0_rc1.ebuild b/mail-client/mailody/mailody-0.4.0_rc1.ebuild
index 3da3977d9a6e..e7bb8fae4933 100644
--- a/mail-client/mailody/mailody-0.4.0_rc1.ebuild
+++ b/mail-client/mailody/mailody-0.4.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.4.0_rc1.ebuild,v 1.1 2007/01/22 18:30:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailody/mailody-0.4.0_rc1.ebuild,v 1.2 2007/01/22 19:53:19 flameeyes Exp $
inherit kde
@@ -21,3 +21,5 @@ RDEPEND="=dev-db/sqlite-3*
S="${WORKDIR}/${MY_P}"
need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-fix-parsing.patch"