Adding patch for xml-stream error bug

4 files changed, 41 insertions, 12 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index e64cb56fd150..79c91d7d35e6 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.20 2004/04/09 10:41:45 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.21 2004/04/09 15:14:58 humpback Exp $
+
+  09 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>; jabberd-2.0.ebuild:
+  Added patch to a XML stream bug. See
+  http://www.jabberstudio.org/projects/jabberd2/bugs/view.php?id=3061 credit for
+  this must be given to cfs@nova.es
 
   09 Apr 2004; David Holm <dholm@gentoo.org> jabberd-2.0.ebuild:
   Added to ~ppc.
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 27b9643074fc..7720f2e7295f 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,20 +1,21 @@
-MD5 37c6db4c09ac13a97d15aa6e1974e4e9 ChangeLog 3343
-MD5 feb892dd78b8949abf9821f99224a1c1 jabberd-1.4.3-r1.ebuild 5122
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
 MD5 e7dabcd4bd0bdfff7949e413c7b5ad08 jabberd-1.4.3-r2.ebuild 5092
+MD5 9389f201b581b1283faf472a18132f2e ChangeLog 3580
 MD5 6ec3a063b494e17a853ba109879bc9f6 jabberd-1.4.3-r3.ebuild 5234
-MD5 3280347095a9ad4f0bc618e4efb583f9 jabberd-2.0.ebuild 4849
-MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
-MD5 0bf75251324b3e2fc7d4200844ac7c35 files/jabber.rc6-r6 960
-MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r1 129
+MD5 b87dc15ef31728a7ff87dbe6719b6ee4 jabberd-2.0.ebuild 4952
+MD5 feb892dd78b8949abf9821f99224a1c1 jabberd-1.4.3-r1.ebuild 5122
 MD5 577eb7826ce2cf3a4c1181ea32c47b20 files/jabber.rc6-r5 881
 MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
-MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
-MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
+MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
+MD5 0bf75251324b3e2fc7d4200844ac7c35 files/jabber.rc6-r6 960
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r2 129
+MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
+MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
+MD5 581e75f5efa2e81db08d901fc0a94648 files/jabber.rc6-r7 1788
 MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r3 129
 MD5 d07e9280a9fed9f133b6900d542a81df files/digest-jabberd-2.0 65
+MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
+MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3-r1 129
+MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 MD5 fd9c831e8ed6c9fcefc6c1ca27df1b8b files/jabber-conf.d 371
-MD5 581e75f5efa2e81db08d901fc0a94648 files/jabber.rc6-r7 1788
-MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
diff --git a/net-im/jabberd/files/xml-stream-patch-00 b/net-im/jabberd/files/xml-stream-patch-00
new file mode 100644
index 000000000000..9edb0d9a8073
--- /dev/null
+++ b/net-im/jabberd/files/xml-stream-patch-00
@@ -0,0 +1,17 @@
+--- error.c.old	2004-03-20 14:39:57.985636816 +0100
++++ error.c	2004-03-20 14:40:42.025941672 +0100
+@@ -71,7 +71,13 @@
+         len += sprintf(&(buf->data[len]), "<stream:error xmlns:stream='" uri_STREAMS "'><%s xmlns='" uri_STREAM_ERR "'/><text xmlns='" uri_STREAM_ERR "'>%s</text></stream:error>", _stream_errors[err], text);
+ 
+     if(s->state < state_STREAM)
+-        len += sprintf(&(buf->data[len]), "</stream:stream>");
++	{
++	 char *streamend= "</stream:stream>";
++	 printf ("About to write %d bytes\n", strlen (streamend)); 
++	 // len += sprintf(&(buf->data[len]), "</stream:stream>");
++	 memcpy (&(buf->data[len]), streamend, strlen (streamend)); 
++	 len += strlen (streamend); 
++	}
+ 
+     assert(len == buf->len);
+ 
diff --git a/net-im/jabberd/jabberd-2.0.ebuild b/net-im/jabberd/jabberd-2.0.ebuild
index f6698b4e40e3..0d67c4bf1f83 100644
--- a/net-im/jabberd/jabberd-2.0.ebuild
+++ b/net-im/jabberd/jabberd-2.0.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/net-im/jabberd/jabberd-2.0.ebuild,v 1.2 2004/04/09 10:41:45 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.ebuild,v 1.3 2004/04/09 15:14:58 humpback Exp $
 
 MY_PV="2.0s2"
 S="${WORKDIR}/${PN}-${MY_PV}"
@@ -32,6 +32,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${PN}-${MY_PV}.tar.gz
+	cd ${S}/sx
+	epatch ${FILESDIR}/xml-stream-patch-00
+}
+
 src_compile() {
 	storage="fs"
 	authreg="anon"