diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-04-15 21:59:19 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-04-15 21:59:19 +0000 |
| commit | c963d769d9b8a0a7f05d0bbc04638f0a042b1c05 (patch) | |
| tree | 717a7b97c3619fee3879edc499b4a8c625a31662 /app-office | |
| parent | Remove net-www/mod_authenticache from the tree (bug #79429). (diff) | |
| download | gentoo-2-c963d769d9b8a0a7f05d0bbc04638f0a042b1c05.tar.gz gentoo-2-c963d769d9b8a0a7f05d0bbc04638f0a042b1c05.tar.bz2 gentoo-2-c963d769d9b8a0a7f05d0bbc04638f0a042b1c05.zip | |
bring security patch in line with upstream
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-office')
9 files changed, 57 insertions, 54 deletions
diff --git a/app-office/openoffice-ximian/files/1.1.3/crash-objstream.diff b/app-office/openoffice-ximian/files/1.1.3/crash-objstream.diff deleted file mode 100644 index b23bb413eb4c..000000000000 --- a/app-office/openoffice-ximian/files/1.1.3/crash-objstream.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: sot/source/sdstor/stgole.cxx -=================================================================== -RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v -retrieving revision 1.4 -diff -u -p -u -r1.4 stgole.cxx ---- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 -+++ sot/source/sdstor/stgole.cxx 12 Apr 2005 10:14:48 -0000 -@@ -157,7 +157,7 @@ BOOL StgCompObjStream::Load() - INT32 nLen1 = 0; - *this >> nLen1; - sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; -- if( Read( p, nLen1 ) == (ULONG) nLen1 ) -+ if( Read( p, (USHORT) nLen1 ) == (ULONG) nLen1 ) - { - aUserName = String( p, gsl_getSystemTextEncoding() ); - /* // Now we can read the CB format diff --git a/app-office/openoffice-ximian/files/1.1.3/cws-heapbug_CAN-2005-0941.diff b/app-office/openoffice-ximian/files/1.1.3/cws-heapbug_CAN-2005-0941.diff new file mode 100644 index 000000000000..4ad65421c1a2 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/cws-heapbug_CAN-2005-0941.diff @@ -0,0 +1,17 @@ +Index: source/sdstor/stgole.cxx +=================================================================== +RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v +retrieving revision 1.4 +retrieving revision 1.4.206.1 +diff -u -u -r1.4 -r1.4.206.1 +--- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 ++++ sot/source/sdstor/stgole.cxx 11 Apr 2005 16:22:26 -0000 1.4.206.1 +@@ -156,6 +156,8 @@ + *this >> aClsId; + INT32 nLen1 = 0; + *this >> nLen1; ++ // the higher bits are ignored ++ nLen1 &= 0xFFFF; + sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; + if( Read( p, nLen1 ) == (ULONG) nLen1 ) + { diff --git a/app-office/openoffice-ximian/files/1.1.4/crash-objstream.diff b/app-office/openoffice-ximian/files/1.1.4/crash-objstream.diff deleted file mode 100644 index b23bb413eb4c..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/crash-objstream.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: sot/source/sdstor/stgole.cxx -=================================================================== -RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v -retrieving revision 1.4 -diff -u -p -u -r1.4 stgole.cxx ---- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 -+++ sot/source/sdstor/stgole.cxx 12 Apr 2005 10:14:48 -0000 -@@ -157,7 +157,7 @@ BOOL StgCompObjStream::Load() - INT32 nLen1 = 0; - *this >> nLen1; - sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; -- if( Read( p, nLen1 ) == (ULONG) nLen1 ) -+ if( Read( p, (USHORT) nLen1 ) == (ULONG) nLen1 ) - { - aUserName = String( p, gsl_getSystemTextEncoding() ); - /* // Now we can read the CB format diff --git a/app-office/openoffice-ximian/files/1.1.4/cws-heapbug_CAN-2005-0941.diff b/app-office/openoffice-ximian/files/1.1.4/cws-heapbug_CAN-2005-0941.diff new file mode 100644 index 000000000000..4ad65421c1a2 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.4/cws-heapbug_CAN-2005-0941.diff @@ -0,0 +1,17 @@ +Index: source/sdstor/stgole.cxx +=================================================================== +RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v +retrieving revision 1.4 +retrieving revision 1.4.206.1 +diff -u -u -r1.4 -r1.4.206.1 +--- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 ++++ sot/source/sdstor/stgole.cxx 11 Apr 2005 16:22:26 -0000 1.4.206.1 +@@ -156,6 +156,8 @@ + *this >> aClsId; + INT32 nLen1 = 0; + *this >> nLen1; ++ // the higher bits are ignored ++ nLen1 &= 0xFFFF; + sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; + if( Read( p, nLen1 ) == (ULONG) nLen1 ) + { diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild index aa43cb111486..13a5e9a1d6b6 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.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/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild,v 1.2 2005/04/12 19:32:00 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.6-r1.ebuild,v 1.3 2005/04/15 21:55:05 suka Exp $ # Notes: # @@ -247,7 +247,7 @@ src_unpack() { epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch # Security fix, bug #88863 - epatch ${FILESDIR}/${OO_VER}/crash-objstream.diff + epatch ${FILESDIR}/${OO_VER}/cws-heapbug_CAN-2005-0941.diff if use ppc; then epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild index c1e9309e6fe4..a07087b709cc 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.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/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.3 2005/04/15 00:56:47 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.4 2005/04/15 21:55:05 suka Exp $ # Notes: # @@ -269,7 +269,7 @@ src_unpack() { epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch # Security fix, bug #88863 - epatch ${FILESDIR}/${OO_VER}/crash-objstream.diff + epatch ${FILESDIR}/${OO_VER}/cws-heapbug_CAN-2005-0941.diff # Workaround for bug #73940, may break debug use flag on ppc if use ppc; then diff --git a/app-office/openoffice/files/1.1.4/crash-objstream.diff b/app-office/openoffice/files/1.1.4/crash-objstream.diff deleted file mode 100644 index b23bb413eb4c..000000000000 --- a/app-office/openoffice/files/1.1.4/crash-objstream.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: sot/source/sdstor/stgole.cxx -=================================================================== -RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v -retrieving revision 1.4 -diff -u -p -u -r1.4 stgole.cxx ---- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 -+++ sot/source/sdstor/stgole.cxx 12 Apr 2005 10:14:48 -0000 -@@ -157,7 +157,7 @@ BOOL StgCompObjStream::Load() - INT32 nLen1 = 0; - *this >> nLen1; - sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; -- if( Read( p, nLen1 ) == (ULONG) nLen1 ) -+ if( Read( p, (USHORT) nLen1 ) == (ULONG) nLen1 ) - { - aUserName = String( p, gsl_getSystemTextEncoding() ); - /* // Now we can read the CB format diff --git a/app-office/openoffice/files/1.1.4/cws-heapbug_CAN-2005-0941.diff b/app-office/openoffice/files/1.1.4/cws-heapbug_CAN-2005-0941.diff new file mode 100644 index 000000000000..4ad65421c1a2 --- /dev/null +++ b/app-office/openoffice/files/1.1.4/cws-heapbug_CAN-2005-0941.diff @@ -0,0 +1,17 @@ +Index: source/sdstor/stgole.cxx +=================================================================== +RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v +retrieving revision 1.4 +retrieving revision 1.4.206.1 +diff -u -u -r1.4 -r1.4.206.1 +--- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 ++++ sot/source/sdstor/stgole.cxx 11 Apr 2005 16:22:26 -0000 1.4.206.1 +@@ -156,6 +156,8 @@ + *this >> aClsId; + INT32 nLen1 = 0; + *this >> nLen1; ++ // the higher bits are ignored ++ nLen1 &= 0xFFFF; + sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; + if( Read( p, nLen1 ) == (ULONG) nLen1 ) + { diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild index 1ed432b3b2f3..2e244b6ab648 100644 --- a/app-office/openoffice/openoffice-1.1.4-r1.ebuild +++ b/app-office/openoffice/openoffice-1.1.4-r1.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/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.4 2005/04/15 01:00:56 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.5 2005/04/15 21:59:19 suka Exp $ # Notes: # @@ -251,7 +251,7 @@ src_unpack() { epatch ${FILESDIR}/${PV}/getcompver.awk.patch # Security fix, bug #88863 - epatch ${FILESDIR}/${PV}/crash-objstream.diff + epatch ${FILESDIR}/${PV}/cws-heapbug_CAN-2005-0941.diff # Workaround for bug #73940, may break debug use flag on ppc if use ppc; then |