Fixed typo in sqimap_get_message() which resulted in php warnings in 5.2.x

(Portage version: 2.1.2.10)

4 files changed, 22 insertions, 2 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 6f984b1e8920..2e1ac4a09f34 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/squirrelmail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.92 2007/05/21 17:19:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.93 2007/06/10 16:16:32 eradicator Exp $
+
+*squirrelmail-1.5.1-r5 (10 Jun 2007)
+
+  10 Jun 2007; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/squirrelmail-1.5.1-sqimap_get_message.patch,
+  -squirrelmail-1.5.1-r4.ebuild, +squirrelmail-1.5.1-r5.ebuild:
+  Fixed typo in sqimap_get_message() which resulted in php warnings in 5.2.x
 
   21 May 2007; Jeremy Huddleston <eradicator@gentoo.org>
   -squirrelmail-1.4.9a.ebuild:
diff --git a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r4 b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r5
index a508701ccbf1..a508701ccbf1 100644
--- a/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r4
+++ b/mail-client/squirrelmail/files/digest-squirrelmail-1.5.1-r5
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.5.1-sqimap_get_message.patch b/mail-client/squirrelmail/files/squirrelmail-1.5.1-sqimap_get_message.patch
new file mode 100644
index 000000000000..a96bc137b3a1
--- /dev/null
+++ b/mail-client/squirrelmail/files/squirrelmail-1.5.1-sqimap_get_message.patch
@@ -0,0 +1,12 @@
+diff -Naurp squirrelmail-1.5.1.orig/functions/imap_messages.php squirrelmail-1.5.1/functions/imap_messages.php
+--- squirrelmail-1.5.1.orig/functions/imap_messages.php	2006-02-12 10:21:50.000000000 -0800
++++ squirrelmail-1.5.1/functions/imap_messages.php	2007-06-10 09:08:46.000000000 -0700
+@@ -923,7 +923,7 @@ function sqimap_get_message($imap_stream
+     if ($read) {
+         if (preg_match('/.+FLAGS\s\((.*)\)\s/AUi',$read[0],$regs)) {
+             if (trim($regs[1])) {
+-                $flags = preg_split('/ /', $regs[1],-1,'PREG_SPLIT_NI_EMPTY');
++                $flags = preg_split('/ /', $regs[1],-1,PREG_SPLIT_NO_EMPTY);
+             }
+         }
+     } else {
diff --git a/mail-client/squirrelmail/squirrelmail-1.5.1-r4.ebuild b/mail-client/squirrelmail/squirrelmail-1.5.1-r5.ebuild
index 383b619c0d18..aa62cd2c1ed1 100644
--- a/mail-client/squirrelmail/squirrelmail-1.5.1-r4.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.5.1-r5.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/squirrelmail/squirrelmail-1.5.1-r4.ebuild,v 1.1 2007/05/21 17:11:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.5.1-r5.ebuild,v 1.1 2007/06/10 16:16:32 eradicator Exp $
 
 IUSE="crypt ldap spell ssl filter mysql postgres nls"
 
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2006-6142-mime.patch
 	epatch ${FILESDIR}/squirrelmail-1.5.1-ie-mime.patch
 	epatch ${FILESDIR}/squirrelmail-1.5.1-CVE-2007-1262.patch
+	epatch ${FILESDIR}/squirrelmail-1.5.1-sqimap_get_message.patch
 
 	mv config/config_default.php config/config.php