Fixed upstream bug #762 with buggy reply.

Package-Manager: portage-2.0.52-r1

diff --git a/www-apps/open-xchange/ChangeLog b/www-apps/open-xchange/ChangeLog
index cb4b2c12ecb7f2222a47cd287298b6504e08c142..d39a388f4180fc98e114218010852d5307bce42b 100644 (file)
--- a/www-apps/open-xchange/ChangeLog
+++ b/www-apps/open-xchange/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/open-xchange
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.3 2005/09/24 23:38:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.4 2005/10/01 18:40:02 eradicator Exp $
+
+  01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/open-xchange-0.8.1.2-reply.patch, open-xchange-0.8.1.2.ebuild:
+  Fixed upstream bug #762 with buggy reply.
 
   24 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
   +files/open-xchange-0.8.1.2-login.patch, open-xchange-0.8.1.2.ebuild:

diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest
index 744d3d6b676bb36ff34974b87bd69b4a56cd8cc5..a1a1c6dc3a48940779c81857702b43dc2c20f5f7 100644 (file)
--- a/www-apps/open-xchange/Manifest
+++ b/www-apps/open-xchange/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 83f86a33d2733c91822242933e7f49cc open-xchange-0.8.1.2.ebuild 21672
+MD5 6b0fe240b030ce01badb623840655ade open-xchange-0.8.1.2.ebuild 21778
 MD5 a339b15041bb6d450a7535f3df1fcc4c metadata.xml 247
-MD5 c2f6e496321314528148a8c0d02dd66a ChangeLog 890
+MD5 e919244becc3d4c0544c9e81ba78bae9 ChangeLog 1064
 MD5 2ad5cb7b97eca4314016247cde421449 files/slapd.ox.inc 2019
 MD5 ec8d72f6da3dbefde48787a53fa071bf files/digest-open-xchange-0.8.1.2 138
 MD5 5388f979621c5e4d333aef5cd37f0062 files/init.d.open-xchange 1877
 MD5 cfa72c4f5e62b779052acf1cd629234b files/88_mod_jk.ox.conf 1228
 MD5 7d1504e4241974d3583575b3827b0f5a files/open-xchange-htaccess 174
+MD5 aba374392dbfe403d7b11f84e8a33a31 files/open-xchange-0.8.1.2-reply.patch 750
 MD5 b9bb53f0dd8125a862c1cbc45ab7c06f files/open-xchange-0.8.1.2-login.patch 638
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNu0CArHZZzCEUG0RAhr4AJ49WnP+IgUz9vL12b3huAoR3XDr/wCfcPFT
-pdi2EXxJcvl9qVijkmEQeGo=
-=rc2v
------END PGP SIGNATURE-----

diff --git a/www-apps/open-xchange/files/open-xchange-0.8.1.2-reply.patch b/www-apps/open-xchange/files/open-xchange-0.8.1.2-reply.patch
new file mode 100644 (file)
index 0000000..38a1ff2
--- /dev/null
+++ b/www-apps/open-xchange/files/open-xchange-0.8.1.2-reply.patch
@@ -0,0 +1,13 @@
+--- open-xchange-0.8.1-2.orig/src/com/openexchange/webmail/ComposeMessage.java 2005-08-26 08:08:58.000000000 -0700
++++ open-xchange-0.8.1-2/src/com/openexchange/webmail/ComposeMessage.java      2005-10-01 11:38:34.000000000 -0700
+@@ -408,8 +408,8 @@ public class ComposeMessage {
+                   
+               } else if (!wms.draft && tmp_wms.getFrom() != null) {
+                   String rht = no.getCode("reply_header_text");
+-                  rht = rht.replaceAll("${date}", tmp_wms.getSentDate());
+-                  rht = rht.replaceAll("${from}", WebmailTools.htmlFormat(tmp_wms.getFrom()));
++                  rht = rht.replaceAll("\\$\\{date\\}", tmp_wms.getSentDate());
++                  rht = rht.replaceAll("\\$\\{from\\}", WebmailTools.htmlFormat(tmp_wms.getFrom()));
+                   mailtext.append(rht + "\n\n");
+                   
+               }

diff --git a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
index e6c7f8af88c20a0efee2d2574d7986ba39d7d7f1..bc98d5b40d354b3be85f43eea78e5bf5ee9781ab 100644 (file)
--- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.4 2005/09/25 18:31:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.5 2005/10/01 18:40:02 eradicator Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -72,6 +72,9 @@ src_unpack() {
        # http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=734
        epatch ${FILESDIR}/${P}-login.patch
 
+       # http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=762
+       epatch ${FILESDIR}/${P}-reply.patch
+
        # http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=656
        sed -i "s|\${DESTDIR}|\$(DESTDIR)|g" Makefile.am