Trivial patch to fix double quoting of messages in replies. Fixes bug #52656.

5 files changed, 47 insertions, 12 deletions

diff --git a/mail-client/squirrelmail/ChangeLog b/mail-client/squirrelmail/ChangeLog
index 5b2dab354fcd..11d7e32d5a83 100644
--- a/mail-client/squirrelmail/ChangeLog
+++ b/mail-client/squirrelmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/squirrelmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.4 2004/06/02 09:25:58 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/ChangeLog,v 1.5 2004/06/02 19:33:42 eradicator Exp $
+
+  02 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  squirrelmail-1.4.3-r1.ebuild, squirrelmail-1.4.3.ebuild,
+  files/squirrelmail-1.4.3-compose.patch:
+  Trivial patch to fix double quoting of messages in replies.  Fixes bug #52656.
 
   02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> squirrelmail-1.4.3.ebuild:
   Stable on alpha, bug 52434.
diff --git a/mail-client/squirrelmail/Manifest b/mail-client/squirrelmail/Manifest
index 03dddd1d9ebc..58d4436b1d04 100644
--- a/mail-client/squirrelmail/Manifest
+++ b/mail-client/squirrelmail/Manifest
@@ -1,13 +1,14 @@
-MD5 73fe3f24cf52892f23afb6e4faf1e597 squirrelmail-1.4.3_rc1-r1.ebuild 5351
-MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
-MD5 c9234d88e7875bdc8c38fbcf37c2e6ad ChangeLog 9396
+MD5 ee4e859992a6c80640f7a56b0165205f squirrelmail-1.4.3-r1.ebuild 5403
+MD5 d5d817f3126d8a78e5a798bda1d35591 squirrelmail-1.4.3.ebuild 5109
 MD5 3fe6178cb758095975c5e475eeb2ec68 squirrelmail-1.4.3_rc1.ebuild 5057
-MD5 d86f445824649f6ebf86251e9b1bd245 squirrelmail-1.4.3-r1.ebuild 5350
-MD5 6a9aad974cf16df42c576680d9a8788d squirrelmail-1.4.3.ebuild 5052
-MD5 19099cd147d6281aad79ea067c5ed4fd files/digest-squirrelmail-1.4.3_rc1-r1 639
+MD5 fb0460756d6b167ff3cc6d0193f1203c ChangeLog 9640
+MD5 08cd5d6f4b8f101029a526ea0a1ea4b1 metadata.xml 258
+MD5 73fe3f24cf52892f23afb6e4faf1e597 squirrelmail-1.4.3_rc1-r1.ebuild 5351
+MD5 a1527f151877e56d7ded68a08be86d27 files/digest-squirrelmail-1.4.3 635
+MD5 ebb6924dba63e16023a37f0f4f5563e8 files/squirrelmail-fortune.patch 603
 MD5 a34a9335bafb3173bb60b373caae8c4e files/postinstall-en.txt 698
-MD5 19099cd147d6281aad79ea067c5ed4fd files/digest-squirrelmail-1.4.3_rc1 639
+MD5 80c40875ee4e66e1b38e2d70cd7f5584 files/squirrelmail-1.4.3-compose.patch 1096
 MD5 a1527f151877e56d7ded68a08be86d27 files/digest-squirrelmail-1.4.3-r1 635
-MD5 ebb6924dba63e16023a37f0f4f5563e8 files/squirrelmail-fortune.patch 603
-MD5 a1527f151877e56d7ded68a08be86d27 files/digest-squirrelmail-1.4.3 635
+MD5 19099cd147d6281aad79ea067c5ed4fd files/digest-squirrelmail-1.4.3_rc1 639
 MD5 1ebd5ce3ff0ce02fa62f3890b6a8f255 files/ldapuserdata-0.4-gentoo.patch 709
+MD5 19099cd147d6281aad79ea067c5ed4fd files/digest-squirrelmail-1.4.3_rc1-r1 639
diff --git a/mail-client/squirrelmail/files/squirrelmail-1.4.3-compose.patch b/mail-client/squirrelmail/files/squirrelmail-1.4.3-compose.patch
new file mode 100644
index 000000000000..97b7a0a9f50d
--- /dev/null
+++ b/mail-client/squirrelmail/files/squirrelmail-1.4.3-compose.patch
@@ -0,0 +1,23 @@
+--- compose.php.orig	2004-05-31 22:47:22.000000000 -0700
++++ compose.php	2004-06-01 09:06:13.286277000 -0700
+@@ -14,7 +14,7 @@
+  *    - Send mail
+  *    - Save As Draft
+  *
+- * $Id: squirrelmail-1.4.3-compose.patch,v 1.1 2004/06/02 19:33:43 eradicator Exp $
++ * $Id: squirrelmail-1.4.3-compose.patch,v 1.1 2004/06/02 19:33:43 eradicator Exp $
+  */
+ 
+ /* Path for SquirrelMail required files. */
+@@ -757,9 +757,9 @@
+               sqWordWrap($rewrap_body[$i], ($editor_size));
+                 if (preg_match("/^(>+)/", $rewrap_body[$i], $matches)) {
+                     $gt = $matches[1];
+-                    $body .= $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
++                    $body .= '>' . str_replace("\n", "\n>$gt ", rtrim($rewrap_body[$i])) ."\n";
+                 } else {
+-                    $body .= $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
++                    $body .= '> ' . str_replace("\n", "\n> ", rtrim($rewrap_body[$i])) . "\n";
+                 }
+                 unset($rewrap_body[$i]);
+             }
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild
index b1c4ab275d75..02ca8718c4cc 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild,v 1.1 2004/05/31 04:15:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3-r1.ebuild,v 1.2 2004/06/02 19:33:42 eradicator Exp $
 
 IUSE="crypt virus-scan ldap ssl"
 
@@ -49,6 +49,9 @@ src_unpack() {
 	mv config/config_default.php config/config.php
 	epatch ${FILESDIR}/${PN}-fortune.patch
 
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-compose.patch
+
 	# Now do the plugins
 	cd ${S}/plugins
 
diff --git a/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild b/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild
index b90a6ee353cb..f88d381c7061 100644
--- a/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild
+++ b/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild,v 1.3 2004/06/02 09:25:58 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/squirrelmail/squirrelmail-1.4.3.ebuild,v 1.4 2004/06/02 19:33:42 eradicator Exp $
 
 inherit webapp-apache eutils
 
@@ -60,6 +60,9 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-fortune.patch
 
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-compose.patch
+
 	# Now do the plugins
 	cd ${S}/plugins