From 486ba58341f4cb0d71bb68e3fbcbd5aa9ec0a3e4 Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 30 Oct 2008 10:27:28 +0000 Subject: [PATCH] update to OpenOffice.Org 2.4.2, which fixes the following vulns: * CVE-2008-2237: Manipulated WMF files can lead to heap overflows and arbitrary code execution * CVE-2008-2238: Manipulated EMF files can lead to heap overflows and arbitrary code execution --- editors/openoffice/Makefile | 12 ++++---- editors/openoffice/distinfo | 50 +++++++++++++++---------------- editors/openoffice/pkg/PLIST-main | 7 +---- 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 7c69b79ace2..cdc2268411b 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.78 2008/06/27 13:11:11 kurt Exp $ +# $OpenBSD: Makefile,v 1.79 2008/10/30 10:27:28 robert Exp $ ONLY_FOR_ARCHS= amd64 i386 @@ -6,13 +6,13 @@ COMMENT-main= multi-platform productivity suite COMMENT-kde= optional integration of OpenOffice to the KDE environment COMMENT-java= optional integration of OpenOffice java features -VERSION= 2.4.1 +VERSION= 2.4.2 DISTNAME= OOo_${VERSION} -WRKDIST= ${WRKDIR}/OOH680_m17 +WRKDIST= ${WRKDIR}/OOH680_m18 PKGNAME= openoffice-${VERSION} -PKGNAME-main= openoffice-${VERSION}p0 -PKGNAME-kde= openoffice-kde-${VERSION}p0 -PKGNAME-java= openoffice-java-${VERSION}p1 +PKGNAME-main= openoffice-${VERSION} +PKGNAME-kde= openoffice-kde-${VERSION} +PKGNAME-java= openoffice-java-${VERSION} CATEGORIES= editors productivity SHARED_LIBS= stlport_gcc 4.5 diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo index 81c9d422041..48289ed8601 100644 --- a/editors/openoffice/distinfo +++ b/editors/openoffice/distinfo @@ -1,35 +1,35 @@ -MD5 (openoffice/OOo_2.4.1_src_binfilter.tar.bz2) = JH6ZsyLN1ALWDEYFMvaysA== -MD5 (openoffice/OOo_2.4.1_src_core.tar.bz2) = 8uRdO8VkZ6DyJsZTje6ORg== -MD5 (openoffice/OOo_2.4.1_src_l10n.tar.bz2) = zmT85239MRPO193uzgnSeQ== -MD5 (openoffice/OOo_2.4.1_src_sdk.tar.bz2) = gw2J+KKFOsj5xmd6StCC9w== -MD5 (openoffice/OOo_2.4.1_src_system.tar.bz2) = 6AsLcrbUoFIHeeBA+vhfAw== +MD5 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = UJyZjrJI0iB+JkAEbTJB2g== +MD5 (openoffice/OOo_2.4.2_src_core.tar.bz2) = R4vH7NNpr7ctnLCbSMOZpA== +MD5 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = oi/YDsW3sSlMnA+5sZXPdw== +MD5 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = 5g21OLl9/zEfX0vK3L9FdA== +MD5 (openoffice/OOo_2.4.2_src_system.tar.bz2) = 02qfEBFYhsXB9g7e+3QRRA== MD5 (openoffice/build-java-target-2.4.0.diff) = TA2oGby24F2ohDLinth12w== MD5 (openoffice/ooo-desktop-0.1.tar.gz) = dU5VRZxt8d6nfJdZccw6Og== -RMD160 (openoffice/OOo_2.4.1_src_binfilter.tar.bz2) = BP/OFn+UolD5TwWSOnCvCwdExBc= -RMD160 (openoffice/OOo_2.4.1_src_core.tar.bz2) = ZPQ9QmAFtsX0ZM9V5y30H+gzYgs= -RMD160 (openoffice/OOo_2.4.1_src_l10n.tar.bz2) = 1B9Dsn6ErlpGILWR5G2ITgyUpyw= -RMD160 (openoffice/OOo_2.4.1_src_sdk.tar.bz2) = C174L9LC8GHyHKu023DM1H+P9wY= -RMD160 (openoffice/OOo_2.4.1_src_system.tar.bz2) = 5HbkyggExY5Mgkm28X8QAJStAw0= +RMD160 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = CWYkRPNZ+Gu37uwMA1rik2DpieU= +RMD160 (openoffice/OOo_2.4.2_src_core.tar.bz2) = 0p7X0jp2FrBdhVwXLm8UiusPS2k= +RMD160 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = eiv3y+QEt/6MthxnBxf1QEbhyrk= +RMD160 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = bxM0tGCaNylwwDsz2di5/hpYLWk= +RMD160 (openoffice/OOo_2.4.2_src_system.tar.bz2) = Fy/N4Ab16B875SarUNuxCmfSd7M= RMD160 (openoffice/build-java-target-2.4.0.diff) = YtyP6lI7FQnrikAIe3nF4O9r8S8= RMD160 (openoffice/ooo-desktop-0.1.tar.gz) = tjUkIQpF0kNW/sN0jvoXxo8tEuc= -SHA1 (openoffice/OOo_2.4.1_src_binfilter.tar.bz2) = pQx/MXZDt1bCsOiTf6nWS5nwXtk= -SHA1 (openoffice/OOo_2.4.1_src_core.tar.bz2) = FwZCJjwy9hTufpQ5qK8wQQ4A0xg= -SHA1 (openoffice/OOo_2.4.1_src_l10n.tar.bz2) = sh9FMeqBgth/9vX2iAkIbBwGMpU= -SHA1 (openoffice/OOo_2.4.1_src_sdk.tar.bz2) = spoOhobyDDoQ5QvWSblXJmE/9ls= -SHA1 (openoffice/OOo_2.4.1_src_system.tar.bz2) = 1CuDRbVe9vDypK21dcgVu7I+wA0= +SHA1 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = HH9lLHGtM2SpjXnU9nUdsAx9qpk= +SHA1 (openoffice/OOo_2.4.2_src_core.tar.bz2) = +EeCiHBiAR80xcjwJ5xA0VkFGjQ= +SHA1 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = xZ/vr59+M3L76yoeRoJwYTt7H6Y= +SHA1 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = USnj69TKGLB3L5kWqUxSkziWxo8= +SHA1 (openoffice/OOo_2.4.2_src_system.tar.bz2) = Z90q9MJaMRwug6fc06gik3juFiU= SHA1 (openoffice/build-java-target-2.4.0.diff) = wHQuUcsUfUO5XzOcsDsFZ+QfKpA= SHA1 (openoffice/ooo-desktop-0.1.tar.gz) = LDMrm/uS6lyQEwk/DzyN3LqSdoU= -SHA256 (openoffice/OOo_2.4.1_src_binfilter.tar.bz2) = tAQD+a3DlYRuM/L8AuC/8TOXZ2aYhwLvixPoNEj705A= -SHA256 (openoffice/OOo_2.4.1_src_core.tar.bz2) = q/V289RRqYGIfCoZhbK3JySvIESR2mQHocbjsLqhBZA= -SHA256 (openoffice/OOo_2.4.1_src_l10n.tar.bz2) = er+FvfU3MNRGE3aj5Echdj3tXgdvuhc52owqZHUv5XE= -SHA256 (openoffice/OOo_2.4.1_src_sdk.tar.bz2) = 5l9yuCvfY5o8G7o6sHHIrnrXVJvBvcsmk1K/0i/QPYI= -SHA256 (openoffice/OOo_2.4.1_src_system.tar.bz2) = ZxP0xq61VI/a7Xo605HbLKNKlS6qbiecSs+pP5rGB3I= +SHA256 (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = tqUEAEs1W0hddk670vZ+fWDXOtG/SL12JwT6kdnLVZc= +SHA256 (openoffice/OOo_2.4.2_src_core.tar.bz2) = 0Ja/43iec9bPCA2noRieHy+5zPJsxcltn5Ob0c/zPfI= +SHA256 (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = Cxhp+Mn8Vu58aDC9hE8hL26Fh9nesMfDEFwazyLaY+g= +SHA256 (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = RvP4MjhN0X3VA71gkCd/iTdIPHSFDdayZm/rgjYbtlM= +SHA256 (openoffice/OOo_2.4.2_src_system.tar.bz2) = KOsMP1O+lNAek4IWacllKhNfYfrr93uKEx6WMtHgkOQ= SHA256 (openoffice/build-java-target-2.4.0.diff) = gNcBW3mUEK1YmHUHcaCtxPN0ktIDCAhl02H7vjO1jpc= SHA256 (openoffice/ooo-desktop-0.1.tar.gz) = /0rJ4ehtHlbspPN2RxpAoTpetfsrNG0tYSeHTLPar30= -SIZE (openoffice/OOo_2.4.1_src_binfilter.tar.bz2) = 6674779 -SIZE (openoffice/OOo_2.4.1_src_core.tar.bz2) = 153573457 -SIZE (openoffice/OOo_2.4.1_src_l10n.tar.bz2) = 81193580 -SIZE (openoffice/OOo_2.4.1_src_sdk.tar.bz2) = 38287 -SIZE (openoffice/OOo_2.4.1_src_system.tar.bz2) = 44069977 +SIZE (openoffice/OOo_2.4.2_src_binfilter.tar.bz2) = 6674731 +SIZE (openoffice/OOo_2.4.2_src_core.tar.bz2) = 153673147 +SIZE (openoffice/OOo_2.4.2_src_l10n.tar.bz2) = 81193726 +SIZE (openoffice/OOo_2.4.2_src_sdk.tar.bz2) = 38354 +SIZE (openoffice/OOo_2.4.2_src_system.tar.bz2) = 44071903 SIZE (openoffice/build-java-target-2.4.0.diff) = 51925 SIZE (openoffice/ooo-desktop-0.1.tar.gz) = 43484 diff --git a/editors/openoffice/pkg/PLIST-main b/editors/openoffice/pkg/PLIST-main index e286ff91d30..448399501e6 100644 --- a/editors/openoffice/pkg/PLIST-main +++ b/editors/openoffice/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.14 2008/06/27 13:11:11 kurt Exp $ +@comment $OpenBSD: PLIST-main,v 1.15 2008/10/30 10:27:28 robert Exp $ @pkgpath editors/openoffice %%SHARED%% bin/sbase @@ -2914,7 +2914,6 @@ openoffice/share/xslt/export/common/ooo2ms_docpr.xsl openoffice/share/xslt/export/common/styles/ openoffice/share/xslt/export/common/styles/style_collector.xsl openoffice/share/xslt/export/common/styles/style_mapping_css.xsl -openoffice/share/xslt/export/common/styles/style_mapping_html32.xsl openoffice/share/xslt/export/common/table/ openoffice/share/xslt/export/common/table/table.xsl openoffice/share/xslt/export/common/table/table_cells.xsl @@ -2942,10 +2941,6 @@ openoffice/share/xslt/export/wordml/ooo2wordml_text.xsl openoffice/share/xslt/export/xhtml/ openoffice/share/xslt/export/xhtml/body.xsl openoffice/share/xslt/export/xhtml/header.xsl -openoffice/share/xslt/export/xhtml/master_chapter_numbering.xsl -openoffice/share/xslt/export/xhtml/master_document.xsl -openoffice/share/xslt/export/xhtml/master_refs_workaround.xsl -openoffice/share/xslt/export/xhtml/master_usability_links.xsl openoffice/share/xslt/export/xhtml/ooo2xhtml.xsl openoffice/share/xslt/export/xhtml/table.xsl openoffice/share/xslt/import/