From 02c3267ed10c2757b65a4c0ed21eb48a69a5d52a Mon Sep 17 00:00:00 2001
From: ghen <ghen>
Date: Mon, 17 Dec 2007 15:53:26 +0000
Subject: Pullup ticket 2247 - requested by tron security update for
 openoffice2-bin

- pkgsrc/misc/openoffice2-bin/Makefile			1.34
- pkgsrc/misc/openoffice2-bin/distinfo			1.13

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sat Dec 15 13:32:17 UTC 2007

   Modified Files:
	   pkgsrc/misc/openoffice2-bin: Makefile distinfo

   Log Message:
   Update "openoffice2-bin" package to version 2.3.1.
   This update provides a fix for the security vulnerability reported in
   CVE-2007-4575 and a lot of other bug-fixes.

   The complete release notes are available here:
   http://development.openoffice.org/releases/2.3.1.html
---
 misc/openoffice2-bin/Makefile |  6 +++---
 misc/openoffice2-bin/distinfo | 14 ++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 74b000b2c2e..665732fb402 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/10/03 18:49:12 bad Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2007/12/17 15:53:26 ghen Exp $
 
 DISTNAME=		openoffice2-bin	# overridden below
 PKGNAME=		openoffice2-bin-${OO_RELEASE}
@@ -16,7 +16,7 @@ CONFLICTS+=		openoffice2-[0-9]*
 CONFLICTS+=		openoffice-linux-[0-9]*
 
 OO_VER=			2.3
-OO_RELEASE=		2.3.0
+OO_RELEASE=		2.3.1
 PLIST_SUBST+=		VER=${OO_VER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
@@ -44,7 +44,7 @@ RUN_LDCONFIG=		no
 
 .if ${EMUL_PLATFORM} == "linux-i386"
 DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=			${WRKDIR}/OOG680_m5_native_packed-1_en-US.9221
+WRKSRC=			${WRKDIR}/OOG680_m9_native_packed-1_en-US.9238
 .elif ${EMUL_PLATFORM} == "solaris-i386"
 DISTNAME=		OOo_${OO_RELEASE}_Solarisx86_install_en-US
 WRKSRC=			${WRKDIR}/OOG680_m5_native_packed-1_en-US.9221/packages
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index c11c7775716..c3f00d4ec96 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.12 2007/10/03 18:49:12 bad Exp $
+$NetBSD: distinfo,v 1.12.2.1 2007/12/17 15:53:28 ghen Exp $
 
-SHA1 (OOo_2.3.0_LinuxIntel_install_en-US.tar.gz) = a878e4874ea22d4224baa91c28eb626d5054f2c2
-RMD160 (OOo_2.3.0_LinuxIntel_install_en-US.tar.gz) = ed6efef8bb3f1d7707e9cacf1a45c89acf1bd613
-Size (OOo_2.3.0_LinuxIntel_install_en-US.tar.gz) = 143253296 bytes
-SHA1 (OOo_2.3.0_SolarisSparc_install_en-US.tar.gz) = 92858dec58dac59289c8b6a0e00ed10ff79ce583
-RMD160 (OOo_2.3.0_SolarisSparc_install_en-US.tar.gz) = 81d390d6c98c53146e4c686b0ea2a9ec7ef1cd4f
-Size (OOo_2.3.0_SolarisSparc_install_en-US.tar.gz) = 143402785 bytes
-SHA1 (OOo_2.3.0_Solarisx86_install_en-US.tar.gz) = 3183bca32e5c34beb51fd8f61aeb44afc73b633a
-RMD160 (OOo_2.3.0_Solarisx86_install_en-US.tar.gz) = 1b6764832c7720fc80a9ea0ccac93b436aaaf9db
-Size (OOo_2.3.0_Solarisx86_install_en-US.tar.gz) = 133193110 bytes
+SHA1 (OOo_2.3.1_LinuxIntel_install_en-US.tar.gz) = 0145902fe029c6b6e98ceb4d70715367f0bf462a
+RMD160 (OOo_2.3.1_LinuxIntel_install_en-US.tar.gz) = d2e17c1a15bb8a337efc9c2e913f716a885b05af
+Size (OOo_2.3.1_LinuxIntel_install_en-US.tar.gz) = 144608882 bytes
-- 
cgit v1.2.3