diff options
| author | salo <salo@pkgsrc.org> | 2005-04-16 12:55:16 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2005-04-16 12:55:16 +0000 |
| commit | a37a1a60158fca3eaa96df2864e2c2a237cb7e00 (patch) | |
| tree | 665a1da62f92bb25cd5e38a52232bd617e0646db /misc/openoffice | |
| parent | 56ab39a79699d28fd7c9e7312d293b07cd645d6e (diff) | |
| download | pkgsrc-a37a1a60158fca3eaa96df2864e2c2a237cb7e00.tar.gz | |
Pullup ticket 442 - requested by Michael Rauch
security fix for openoffice
Revisions pulled up:
- pkgsrc/misc/openoffice/Makefile 1.63
- pkgsrc/misc/openoffice/distinfo 1.31
- pkgsrc/misc/openoffice/patches/patch-az 1.3
- pkgsrc/misc/openoffice-bin/Makefile 1.7
- pkgsrc/misc/openoffice-bin/distinfo 1.4
Module Name: pkgsrc
Committed By: mrauch
Date: Thu Apr 14 20:48:58 UTC 2005
Modified Files:
pkgsrc/misc/openoffice: Makefile distinfo
Added Files:
pkgsrc/misc/openoffice/patches: patch-az
Log Message:
Apply fix for security problem CAN-2005-0941 from OOo CVS.
Bump PKGREVISION.
---
Module Name: pkgsrc
Committed By: mrauch
Date: Thu Apr 14 21:06:44 UTC 2005
Modified Files:
pkgsrc/misc/openoffice-bin: Makefile distinfo
Log Message:
Apply fix for security problem CAN-2005-0941 by installing patched
library.
Bump PKGREVISION.
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/Makefile | 4 | ||||
| -rw-r--r-- | misc/openoffice/distinfo | 3 | ||||
| -rw-r--r-- | misc/openoffice/patches/patch-az | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 751e004d749..9f37e865ff5 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2005/02/26 16:07:46 mrauch Exp $ +# $NetBSD: Makefile,v 1.61.2.1 2005/04/16 12:55:16 salo Exp $ DISTNAME= openoffice-1.1.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/1.1.4/} DISTFILES= OOo_1.1.4_source.tar.gz diff --git a/misc/openoffice/distinfo b/misc/openoffice/distinfo index df58eeb6bf6..598485b4a73 100644 --- a/misc/openoffice/distinfo +++ b/misc/openoffice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2005/02/26 16:07:46 mrauch Exp $ +$NetBSD: distinfo,v 1.29.2.1 2005/04/16 12:55:16 salo Exp $ SHA1 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 3161dbe53f6ec0b0d5a65790a2b1dd3d7331b430 RMD160 (openoffice-1.1.4/OOo_1.1.4_source.tar.gz) = 0e218792bb72106cd494532de373d0f40a5a9587 @@ -55,3 +55,4 @@ SHA1 (patch-av) = f6f0aa984f7d975c721d616b348a69cff6173ff8 SHA1 (patch-aw) = 15a27595dbf7599943ff9847e4841b1b62e792a6 SHA1 (patch-ax) = 4a918df6dfd058fd6abecfc4c9b85a21bfc18364 SHA1 (patch-ay) = f548c8c79d6ef9b1a0d1e521d295bf03cd8f8849 +SHA1 (patch-az) = 2c53d79f5d78aebefc4bc43a7f95b484cadd674a diff --git a/misc/openoffice/patches/patch-az b/misc/openoffice/patches/patch-az new file mode 100644 index 00000000000..fd3ad9fbb42 --- /dev/null +++ b/misc/openoffice/patches/patch-az @@ -0,0 +1,13 @@ +$NetBSD: patch-az,v 1.2.8.1 2005/04/16 12:55:16 salo Exp $ + +--- ../sot/source/sdstor/stgole.cxx.orig 2002-07-22 14:28:43.000000000 +0200 ++++ ../sot/source/sdstor/stgole.cxx +@@ -156,6 +156,8 @@ BOOL StgCompObjStream::Load() + *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 ) + { |