security fix

6 files changed, 486 insertions, 18 deletions

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 2681987dee1b..f7f60494c12c 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.31 2004/04/20 16:18:35 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.32 2004/04/24 10:53:51 suka Exp $
+
+  24 Apr 2004; suka@gentoo.org +files/1.1.0/neon.patch,
+  +files/1.1.1/neon.patch, openoffice-ximian-1.1.51.ebuild,
+  openoffice-ximian-1.1.52.ebuild:
+  Security fix, see:
+  http://secunia.com/advisories/11364/
 
   20 Apr 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.53.ebuild:
   Added to ~ppc.
diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index a9b98a3a0860..b81befe2470d 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,25 +1,27 @@
-MD5 f7f7a6b34009182f8032e44c5e07ca06 ChangeLog 8230
-MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 c1ea8733c97acb9440e2ebbadf748ea1 openoffice-ximian-1.1.51.ebuild 15016
 MD5 690e6a8f0053f90e3359cae085d71df8 openoffice-ximian-1.1.53.ebuild 14879
-MD5 987b9cc61bd74ae41a06d7397c49fca0 openoffice-ximian-1.1.52.ebuild 15157
-MD5 6fa53ac34ee795b8cf56ec4743671283 openoffice-ximian-1.1.51.ebuild 14959
+MD5 6c9fbe62fef8410d452bd25dbc35eee7 openoffice-ximian-1.1.52.ebuild 15214
+MD5 cab8df5ba30f80a507f26b8e9506e1bf ChangeLog 8441
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
+MD5 bd8a36025a84cb2ad840e822f513e468 files/digest-openoffice-ximian-1.1.51 213
 MD5 ebb47daad89ff2dd462d21aad878b42b files/digest-openoffice-ximian-1.1.52 215
 MD5 304c8e86d82be8c1971b0b3f9102cd0e files/digest-openoffice-ximian-1.1.53 215
-MD5 bd8a36025a84cb2ad840e822f513e468 files/digest-openoffice-ximian-1.1.51 213
-MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502
-MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
-MD5 b127671805cbc69b04e45395206746ab files/1.1.0/build.patch 308
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.0/ximian-openoffice.applications 980
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.0/ximian-openoffice.keys 6298
+MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.0/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 9c99fdd340eb8e4c9f09c236eb1a899f files/1.1.0/xooffice-wrapper-1.3 9398
-MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.0/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 7992a51f23c05fdc0b3c422c171f637a files/1.1.0/config.patch 502
+MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.0/neon.patch 8300
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.0/nptl.patch 1285
+MD5 b127671805cbc69b04e45395206746ab files/1.1.0/build.patch 308
+MD5 57dffa4a9df0ca77ebcca05122634d9e files/1.1.0/newstlportfix.patch 10867
 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298
+MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400
 MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221
+MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603
+MD5 ee20d490a8aa62d79ca65e99339e3397 files/1.1.1/neon.patch 8300
+MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
 MD5 fc8711196de6324c9fae45342d159bf3 files/1.1.1/build.patch 330
+MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362
diff --git a/app-office/openoffice-ximian/files/1.1.0/neon.patch b/app-office/openoffice-ximian/files/1.1.0/neon.patch
new file mode 100644
index 000000000000..d68adb2eb353
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.0/neon.patch
@@ -0,0 +1,227 @@
+--- /work/ooo/gnome-ooo/openoffice/build/OOO_1_1_1/neon/neon.patch	2004-03-19 17:32:52.000000000 -0500
++++ neon/neon.patch	2004-04-05 12:38:42.000000000 -0400
+@@ -135,8 +134,8 @@
+ ! #define read _read
+ ! 
+ ! #endif
+-*** misc/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:55:55 2002
+---- misc/build/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:35:49 2002
++*** misc/neon-0.23.5/src/makefile.mk	2004-04-05 12:38:37.706437510 -0400
++--- misc/build/neon-0.23.5/src/makefile.mk	2004-04-05 12:21:47.810143789 -0400
+ ***************
+ *** 1 ****
+ ! dummy
+@@ -190,8 +189,173 @@
+ ! # --- Targets ------------------------------------------------------
+ ! 
+ ! .INCLUDE :  target.mk
+-*** misc/neon-0.23.5/src/ne_props.c	Sun Jul 14 13:18:06 2002
+---- misc/build/neon-0.23.5/src/ne_props.c	Tue Oct 22 17:35:49 2002
++*** misc/neon-0.23.5/src/ne_207.c	2002-06-23 10:04:36.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_207.c	2004-04-05 12:38:18.221460697 -0400
++***************
++*** 1,6 ****
++  /* 
++     WebDAV 207 multi-status response handling
++!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     WebDAV 207 multi-status response handling
++!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 358,369 ****
++  	if (ne_get_status(req)->code == 207) {
++  	    if (!ne_xml_valid(p)) { 
++  		/* The parse was invalid */
++! 		ne_set_error(sess, ne_xml_get_error(p));
++  		ret = NE_ERROR;
++  	    } else if (ctx.is_error) {
++  		/* If we've actually got any error information
++  		 * from the 207, then set that as the error */
++! 		ne_set_error(sess, ctx.buf->data);
++  		ret = NE_ERROR;
++  	    }
++  	} else if (ne_get_status(req)->klass != 2) {
++--- 358,369 ----
++  	if (ne_get_status(req)->code == 207) {
++  	    if (!ne_xml_valid(p)) { 
++  		/* The parse was invalid */
++! 		ne_set_error(sess, "%s", ne_xml_get_error(p));
++  		ret = NE_ERROR;
++  	    } else if (ctx.is_error) {
++  		/* If we've actually got any error information
++  		 * from the 207, then set that as the error */
++! 		ne_set_error(sess, "%s", ctx.buf->data);
++  		ret = NE_ERROR;
++  	    }
++  	} else if (ne_get_status(req)->klass != 2) {
++*** misc/neon-0.23.5/src/ne_auth.c	2002-10-07 16:33:17.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_auth.c	2004-04-05 12:38:18.223460387 -0400
++***************
++*** 908,914 ****
++      if (areq->auth_info_hdr != NULL && 
++  	verify_response(areq, sess, areq->auth_info_hdr)) {
++  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
++! 	ne_set_error(sess->sess, _(sess->spec->fail_msg));
++  	ret = NE_ERROR;
++      } else if (status->code == sess->spec->status_code && 
++  	       areq->auth_hdr != NULL) {
++--- 908,914 ----
++      if (areq->auth_info_hdr != NULL && 
++  	verify_response(areq, sess, areq->auth_info_hdr)) {
++  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
++! 	ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg));
++  	ret = NE_ERROR;
++      } else if (status->code == sess->spec->status_code && 
++  	       areq->auth_hdr != NULL) {
++*** misc/neon-0.23.5/src/ne_compress.c	2002-09-18 16:50:34.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_compress.c	2004-04-05 12:38:18.225460077 -0400
++***************
++*** 1,6 ****
++  /* 
++     Handling of compressed HTTP responses
++!    Copyright (C) 2001-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     Handling of compressed HTTP responses
++!    Copyright (C) 2001-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 252,258 ****
++  	     * doesn't work, and this does, but I have no idea why..
++  	     * Google showed me the way. */
++  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
++! 		ne_set_error(ctx->session, ctx->zstr.msg);
++  		ctx->state = NE_Z_ERROR;
++  		return;
++  	    }
++--- 252,258 ----
++  	     * doesn't work, and this does, but I have no idea why..
++  	     * Google showed me the way. */
++  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
++! 		ne_set_error(ctx->session, "%s", ctx->zstr.msg);
++  		ctx->state = NE_Z_ERROR;
++  		return;
++  	    }
++*** misc/neon-0.23.5/src/ne_locks.c	2002-08-05 16:10:53.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_locks.c	2004-04-05 12:38:18.227459766 -0400
++***************
++*** 723,729 ****
++  	}
++  	else if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++--- 723,729 ----
++  	}
++  	else if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++***************
++*** 792,798 ****
++      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
++  	if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++--- 792,798 ----
++      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
++  	if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++*** misc/neon-0.23.5/src/ne_props.c	2002-07-14 07:18:06.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_props.c	2004-04-05 12:38:27.458027606 -0400
++***************
++*** 1,6 ****
++  /* 
++     WebDAV property manipulation
++!    Copyright (C) 2000-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     WebDAV property manipulation
++!    Copyright (C) 2000-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 136,142 ****
++      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
++  	ret = NE_ERROR;
++      } else if (!ne_xml_valid(handler->parser)) {
++! 	ne_set_error(handler->sess, ne_xml_get_error(handler->parser));
++  	ret = NE_ERROR;
++      }
++  
++--- 136,142 ----
++      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
++  	ret = NE_ERROR;
++      } else if (!ne_xml_valid(handler->parser)) {
++! 	ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser));
++  	ret = NE_ERROR;
++      }
++  
+ ***************
+ *** 457,462 ****
+ --- 457,465 ----
+@@ -204,3 +368,37 @@
+       /* If we get a non-2xx response back here, we wipe the value for
+        * each of the properties in this propstat, so the caller knows to
+        * look at the status instead. It's annoying, since for each prop
++*** misc/neon-0.23.5/src/ne_xml.c	2002-10-08 15:11:31.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_xml.c	2004-04-05 12:38:18.232458991 -0400
++***************
++*** 1,6 ****
++  /* 
++     Higher Level Interface to XML Parsers.
++!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     Higher Level Interface to XML Parsers.
++!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 860,866 ****
++  
++  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
++  {
++!     ne_snprintf(p->error, ERR_SIZE, msg);
++  }
++  
++  #ifdef HAVE_LIBXML
++--- 860,866 ----
++  
++  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
++  {
++!     ne_snprintf(p->error, ERR_SIZE, "%s", msg);
++  }
++  
++  #ifdef HAVE_LIBXML
diff --git a/app-office/openoffice-ximian/files/1.1.1/neon.patch b/app-office/openoffice-ximian/files/1.1.1/neon.patch
new file mode 100644
index 000000000000..d68adb2eb353
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.1/neon.patch
@@ -0,0 +1,227 @@
+--- /work/ooo/gnome-ooo/openoffice/build/OOO_1_1_1/neon/neon.patch	2004-03-19 17:32:52.000000000 -0500
++++ neon/neon.patch	2004-04-05 12:38:42.000000000 -0400
+@@ -135,8 +134,8 @@
+ ! #define read _read
+ ! 
+ ! #endif
+-*** misc/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:55:55 2002
+---- misc/build/neon-0.23.5/src/makefile.mk	Tue Oct 22 17:35:49 2002
++*** misc/neon-0.23.5/src/makefile.mk	2004-04-05 12:38:37.706437510 -0400
++--- misc/build/neon-0.23.5/src/makefile.mk	2004-04-05 12:21:47.810143789 -0400
+ ***************
+ *** 1 ****
+ ! dummy
+@@ -190,8 +189,173 @@
+ ! # --- Targets ------------------------------------------------------
+ ! 
+ ! .INCLUDE :  target.mk
+-*** misc/neon-0.23.5/src/ne_props.c	Sun Jul 14 13:18:06 2002
+---- misc/build/neon-0.23.5/src/ne_props.c	Tue Oct 22 17:35:49 2002
++*** misc/neon-0.23.5/src/ne_207.c	2002-06-23 10:04:36.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_207.c	2004-04-05 12:38:18.221460697 -0400
++***************
++*** 1,6 ****
++  /* 
++     WebDAV 207 multi-status response handling
++!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     WebDAV 207 multi-status response handling
++!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 358,369 ****
++  	if (ne_get_status(req)->code == 207) {
++  	    if (!ne_xml_valid(p)) { 
++  		/* The parse was invalid */
++! 		ne_set_error(sess, ne_xml_get_error(p));
++  		ret = NE_ERROR;
++  	    } else if (ctx.is_error) {
++  		/* If we've actually got any error information
++  		 * from the 207, then set that as the error */
++! 		ne_set_error(sess, ctx.buf->data);
++  		ret = NE_ERROR;
++  	    }
++  	} else if (ne_get_status(req)->klass != 2) {
++--- 358,369 ----
++  	if (ne_get_status(req)->code == 207) {
++  	    if (!ne_xml_valid(p)) { 
++  		/* The parse was invalid */
++! 		ne_set_error(sess, "%s", ne_xml_get_error(p));
++  		ret = NE_ERROR;
++  	    } else if (ctx.is_error) {
++  		/* If we've actually got any error information
++  		 * from the 207, then set that as the error */
++! 		ne_set_error(sess, "%s", ctx.buf->data);
++  		ret = NE_ERROR;
++  	    }
++  	} else if (ne_get_status(req)->klass != 2) {
++*** misc/neon-0.23.5/src/ne_auth.c	2002-10-07 16:33:17.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_auth.c	2004-04-05 12:38:18.223460387 -0400
++***************
++*** 908,914 ****
++      if (areq->auth_info_hdr != NULL && 
++  	verify_response(areq, sess, areq->auth_info_hdr)) {
++  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
++! 	ne_set_error(sess->sess, _(sess->spec->fail_msg));
++  	ret = NE_ERROR;
++      } else if (status->code == sess->spec->status_code && 
++  	       areq->auth_hdr != NULL) {
++--- 908,914 ----
++      if (areq->auth_info_hdr != NULL && 
++  	verify_response(areq, sess, areq->auth_info_hdr)) {
++  	NE_DEBUG(NE_DBG_HTTPAUTH, "Response authentication invalid.\n");
++! 	ne_set_error(sess->sess, "%s", _(sess->spec->fail_msg));
++  	ret = NE_ERROR;
++      } else if (status->code == sess->spec->status_code && 
++  	       areq->auth_hdr != NULL) {
++*** misc/neon-0.23.5/src/ne_compress.c	2002-09-18 16:50:34.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_compress.c	2004-04-05 12:38:18.225460077 -0400
++***************
++*** 1,6 ****
++  /* 
++     Handling of compressed HTTP responses
++!    Copyright (C) 2001-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     Handling of compressed HTTP responses
++!    Copyright (C) 2001-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 252,258 ****
++  	     * doesn't work, and this does, but I have no idea why..
++  	     * Google showed me the way. */
++  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
++! 		ne_set_error(ctx->session, ctx->zstr.msg);
++  		ctx->state = NE_Z_ERROR;
++  		return;
++  	    }
++--- 252,258 ----
++  	     * doesn't work, and this does, but I have no idea why..
++  	     * Google showed me the way. */
++  	    if (inflateInit2(&ctx->zstr, -MAX_WBITS) != Z_OK) {
++! 		ne_set_error(ctx->session, "%s", ctx->zstr.msg);
++  		ctx->state = NE_Z_ERROR;
++  		return;
++  	    }
++*** misc/neon-0.23.5/src/ne_locks.c	2002-08-05 16:10:53.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_locks.c	2004-04-05 12:38:18.227459766 -0400
++***************
++*** 723,729 ****
++  	}
++  	else if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++--- 723,729 ----
++  	}
++  	else if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++***************
++*** 792,798 ****
++      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
++  	if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++--- 792,798 ----
++      if (ret == NE_OK && ne_get_status(req)->klass == 2) {
++  	if (parse_failed) {
++  	    ret = NE_ERROR;
++! 	    ne_set_error(sess, "%s", ne_xml_get_error(parser));
++  	}
++  	else if (ne_get_status(req)->code == 207) {
++  	    ret = NE_ERROR;
++*** misc/neon-0.23.5/src/ne_props.c	2002-07-14 07:18:06.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_props.c	2004-04-05 12:38:27.458027606 -0400
++***************
++*** 1,6 ****
++  /* 
++     WebDAV property manipulation
++!    Copyright (C) 2000-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     WebDAV property manipulation
++!    Copyright (C) 2000-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 136,142 ****
++      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
++  	ret = NE_ERROR;
++      } else if (!ne_xml_valid(handler->parser)) {
++! 	ne_set_error(handler->sess, ne_xml_get_error(handler->parser));
++  	ret = NE_ERROR;
++      }
++  
++--- 136,142 ----
++      if (ret == NE_OK && ne_get_status(req)->klass != 2) {
++  	ret = NE_ERROR;
++      } else if (!ne_xml_valid(handler->parser)) {
++! 	ne_set_error(handler->sess, "%s", ne_xml_get_error(handler->parser));
++  	ret = NE_ERROR;
++      }
++  
+ ***************
+ *** 457,462 ****
+ --- 457,465 ----
+@@ -204,3 +368,37 @@
+       /* If we get a non-2xx response back here, we wipe the value for
+        * each of the properties in this propstat, so the caller knows to
+        * look at the status instead. It's annoying, since for each prop
++*** misc/neon-0.23.5/src/ne_xml.c	2002-10-08 15:11:31.000000000 -0400
++--- misc/build/neon-0.23.5/src/ne_xml.c	2004-04-05 12:38:18.232458991 -0400
++***************
++*** 1,6 ****
++  /* 
++     Higher Level Interface to XML Parsers.
++!    Copyright (C) 1999-2002, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++--- 1,6 ----
++  /* 
++     Higher Level Interface to XML Parsers.
++!    Copyright (C) 1999-2004, Joe Orton <joe@manyfish.co.uk>
++  
++     This library is free software; you can redistribute it and/or
++     modify it under the terms of the GNU Library General Public
++***************
++*** 860,866 ****
++  
++  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
++  {
++!     ne_snprintf(p->error, ERR_SIZE, msg);
++  }
++  
++  #ifdef HAVE_LIBXML
++--- 860,866 ----
++  
++  void ne_xml_set_error(ne_xml_parser *p, const char *msg)
++  {
++!     ne_snprintf(p->error, ERR_SIZE, "%s", msg);
++  }
++  
++  #ifdef HAVE_LIBXML
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild
index 924f8fdaf9e5..182907831f70 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.51.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/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild,v 1.7 2004/04/11 21:23:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.51.ebuild,v 1.8 2004/04/24 10:53:51 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -251,6 +251,9 @@ src_unpack() {
 		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
 	fi
 
+	#Security fix
+	epatch ${FILESDIR}/${OO_VER}/neon.patch
+
 	einfo "Applying Ximian OO.org Patches"
 	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
 
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild
index 30cafd8e08e1..a60ce07c2e3b 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.1.52.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/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild,v 1.6 2004/04/11 16:23:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.52.ebuild,v 1.7 2004/04/24 10:53:51 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -248,6 +248,9 @@ src_unpack() {
 		epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
 	fi
 
+	#Security fix
+	epatch ${FILESDIR}/${OO_VER}/neon.patch
+
 	einfo "Applying Ximian OO.org Patches"
 	${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"