diff options
| author |   Gustavo Felisberto <humpback@gentoo.org> | 2004-04-09 15:14:58 +0000 |
|---|---|---|
| committer | Gustavo Felisberto <humpback@gentoo.org> | 2004-04-09 15:14:58 +0000 |
| commit | 01793c705f815da25569b5608a044ab20ff90179 (patch) | |
| tree | 5c6a4c3026258aee7c6d6d2656eea69a990e27a2 /net-im | |
| parent | add missing keywords (Manifest recommit) (diff) | |
| download | gentoo-2-01793c705f815da25569b5608a044ab20ff90179.tar.gz gentoo-2-01793c705f815da25569b5608a044ab20ff90179.tar.bz2 gentoo-2-01793c705f815da25569b5608a044ab20ff90179.zip | |
Adding patch for xml-stream error bug
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/jabberd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/jabberd/files/xml-stream-patch-00 | 17 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-2.0.ebuild | 8 |
3 files changed, 30 insertions, 2 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/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" |