From 4e1064fb9a0d93f28df7415c8961fe1f75ce681c Mon Sep 17 00:00:00 2001 From: spz Date: Thu, 19 Jun 2008 19:10:30 +0000 Subject: Pullup ticket 2427 - requested by hira Security fix (fixes CVE-2008-2152) Revisions pulled up: - pkgsrc/misc/openoffice2/Makefile 1.47 - pkgsrc/misc/openoffice2/distinfo 1.40 Module Name: pkgsrc Committed By: hira Date: Fri Jun 13 11:20:15 UTC 2008 Modified Files: pkgsrc/misc/openoffice2: Makefile distinfo Log Message: Update to 2.4.1. This release fixes CVE-2008-2152. Release Notes: http://development.openoffice.org/releases/2.4.1.html To generate a diff of this commit: cvs rdiff -r1.46 -r1.47 pkgsrc/misc/openoffice2/Makefile cvs rdiff -r1.39 -r1.40 pkgsrc/misc/openoffice2/distinfo --- misc/openoffice2/Makefile | 6 +++--- misc/openoffice2/distinfo | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index 405475a66d1..fea57126fda 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40.2.1 2008/04/26 04:29:13 rtr Exp $ +# $NetBSD: Makefile,v 1.40.2.2 2008/06/19 19:10:30 spz Exp $ # -OO_VER= 2.4.0 +OO_VER= 2.4.1 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice2-${OO_VER} CATEGORIES= misc @@ -29,7 +29,7 @@ DEPENDS+= libpaper-[0-9]*:../../print/libpaper .include "../../mk/bsd.prefs.mk" -WRKSRC= ${WRKDIR}/OOH680_m12 +WRKSRC= ${WRKDIR}/OOH680_m17 CONFIGURE_DIRS= config_office # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879). diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo index fe2c9fba5c8..04813011b19 100644 --- a/misc/openoffice2/distinfo +++ b/misc/openoffice2/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.35.2.1 2008/04/26 04:29:13 rtr Exp $ +$NetBSD: distinfo,v 1.35.2.2 2008/06/19 19:10:30 spz Exp $ -SHA1 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8 -RMD160 (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = fff7a0a61b19881559e4f20ddd36031565f635e1 -Size (openoffice-2.4.0/OOo_2.4.0_src_binfilter.tar.bz2) = 6675120 bytes -SHA1 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 1f775a0f2b755ad1c4cb7d14df93d86948424e7f -RMD160 (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = f8be874225a4f8a90bf20d563db175f3381e224e -Size (openoffice-2.4.0/OOo_2.4.0_src_core.tar.bz2) = 153590855 bytes -SHA1 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e -RMD160 (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = a52ed9e7a7511ad12cf6cef98e64a3ef384dd383 -Size (openoffice-2.4.0/OOo_2.4.0_src_l10n.tar.bz2) = 81193819 bytes -SHA1 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = cbefb4655987fb70b929b6922c2b27beb1e5db18 -RMD160 (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = ad25cb334f59154db36da8346c47805013f0f6fe -Size (openoffice-2.4.0/OOo_2.4.0_src_system.tar.bz2) = 44072779 bytes +SHA1 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = a50c7f317643b756c2b0e8937fa9d64b99f05ed9 +RMD160 (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 04ffce167f94a250f94f05923a70af0b0744c417 +Size (openoffice-2.4.1/OOo_2.4.1_src_binfilter.tar.bz2) = 6674779 bytes +SHA1 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 170642263c32f614ee7e9439a8af30410e00d318 +RMD160 (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 64f43d426005b6c5f464cf55e72df41fe833620b +Size (openoffice-2.4.1/OOo_2.4.1_src_core.tar.bz2) = 153573457 bytes +SHA1 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = b21f4531ea8182d87ff6f5f68809086c1c063295 +RMD160 (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = d41f43b27e84ae5a4620b591e46d884e0c94a72c +Size (openoffice-2.4.1/OOo_2.4.1_src_l10n.tar.bz2) = 81193580 bytes +SHA1 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = d42b8345b55ef6f0f2a4adb575c815bbb23ec00d +RMD160 (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = e476e4ca0804c58e4c8249b6f17f100094ad030d +Size (openoffice-2.4.1/OOo_2.4.1_src_system.tar.bz2) = 44069977 bytes SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4 -- cgit v1.2.3