diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-06-02 19:33:43 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-06-02 19:33:43 +0000 |
| commit | cf7787565b6a87fd9c3910edab70b81f32699827 (patch) | |
| tree | 601abc911f316f1e47d58339672fde73ba2b09db /mail-client | |
| parent | Masking gaim-0.78-r1 until silc-toolkit gets into more arches (diff) | |
| download | gentoo-2-cf7787565b6a87fd9c3910edab70b81f32699827.tar.gz gentoo-2-cf7787565b6a87fd9c3910edab70b81f32699827.tar.bz2 gentoo-2-cf7787565b6a87fd9c3910edab70b81f32699827.zip | |
Trivial patch to fix double quoting of messages in replies. Fixes bug #52656.
Diffstat (limited to 'mail-client')
4 files changed, 37 insertions, 3 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/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 |