Pullup ticket #3147 - requested by bad

misc/openoffice3-bin: security update Revisions pulled up: - misc/openoffice3-bin/Makefile 1.7 - misc/openoffice3-bin/distinfo 1.4 --- Module Name: pkgsrc Committed By: bad Date: Tue Jun 15 16:48:19 UTC 2010 Modified Files: pkgsrc/misc/openoffice3-bin: Makefile distinfo Log Message: Update openoffice3-bin to 3.2.1. Bugfixes only. Including fixes for CVE-2010-0395: A security vulnerability in OpenOffice.org, related to python scripting, may lead to unexpected code execution. CVE-2009-3555: OpenOffice.org 2 and 3 may be affected by the TLS/SSL Renegotiation Issue in 3rd Party Libraries. The release notes at http://development.openoffice.org/releases/3.2.1.html are not extremely difficult to summarize sensibly.
jsonn · Jun 16, 2010 · 8436071 · 8436071
1 parent e68e370
commit 8436071
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/misc/openoffice3-bin/Makefile b/misc/openoffice3-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/04/07 18:04:46 joerg Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2010/06/16 21:03:18 tron Exp $
 
 DISTNAME=		openoffice3-bin	# overridden below
 PKGNAME=		openoffice3-bin-${OO_RELEASE}
@@ -19,7 +19,7 @@ CONFLICTS+=		openoffice-linux-[0-9]*
 
 OO_VER=			3
 OO_BASEVER=		3.2
-OO_RELEASE=		3.2.0
+OO_RELEASE=		3.2.1
 PLIST_SUBST+=		VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
@@ -54,14 +54,14 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../mk/bsd.prefs.mk"
 
 .if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME=		OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=			${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483
+DISTNAME=		OOo_${OO_RELEASE}_Linux_x86_install-rpm_en-US
+WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502
 .elif ${EMUL_PLATFORM} == "solaris-i386"
-DISTNAME=		OOo_${OO_RELEASE}_Solarisx86_install_en-US
-WRKSRC=			${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483/packages
+DISTNAME=		OOo_${OO_RELEASE}_Solaris_x86_install_en-US
+WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
 .elif ${EMUL_PLATFORM} == "solaris-sparc"
-DISTNAME=		OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC=			${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483/packages
+DISTNAME=		OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US
+WRKSRC=			${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
 .endif
 
 .include "options.mk"

diff --git a/misc/openoffice3-bin/distinfo b/misc/openoffice3-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/03/02 22:57:03 bad Exp $
+$NetBSD: distinfo,v 1.3.2.1 2010/06/16 21:03:18 tron Exp $
 
-SHA1 (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 8edcdf677aeee84eea2cecf896bcdd30bcd98a45
-RMD160 (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 0dc745ecbba13cb5a58e1ad322008c8b309b588f
-Size (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 154346578 bytes
+SHA1 (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = 4848b76debd50b3ec063d2b74f11cfa6a710f000
+RMD160 (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = ae7cd0255c9b51f73500c3133eba036d42b556a5
+Size (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = 153892134 bytes