Pullup ticket 2116 - requested by tron

security update for openoffice2-bin

Revisions pulled up:
- pkgsrc/misc/openoffice2-bin/Makefile				1.29
- pkgsrc/misc/openoffice2-bin/distinfo				1.11

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Wed Jun 20 18:15:31 UTC 2007

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

   Log Message:
   Update öpenoffice2-bin" package to version 2.2.1.
   This an update release for OpenOffice 2.2.0. It addresses the security
   vulnerabilities reported in CVE-2007-0245 and CVE-2007-2754 and fixes
   many other bugs. The complete release notes are available under
   <http://development.openoffice.org/releases/2.2.1.html>.

2 files changed, 10 insertions, 24 deletions

diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
index 8d0a029ae8c..2adbec43c64 100644
--- a/misc/openoffice2-bin/Makefile
+++ b/misc/openoffice2-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2007/04/06 13:42:25 ghen Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2007/06/23 23:32:09 salo Exp $
 
 PKGNAME=		openoffice2-bin-${OO_RELEASE}
 CATEGORIES=		misc
@@ -15,7 +15,7 @@ RPM2PKG=		${PREFIX}/sbin/rpm2pkg
 RPM2PKGARGS=		-d ${PREFIX} -f ${WRKDIR}/PLIST.nouniq -s 1
 
 OO_VER=			2.2
-OO_RELEASE=		2.2.0
+OO_RELEASE=		2.2.1
 PLIST_SUBST+=		VER=${OO_VER:Q}
 MESSAGE_SUBST+=		VER=${OO_VER:Q}
 FILES_SUBST+=		VER=${OO_VER:Q}
@@ -45,27 +45,19 @@ PLIST_SRC+=		${WRKDIR}/PLIST
 ARCH=	${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
 .if ${OPSYS} == "NetBSD"
-.  if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
-.    if !exists(/emul/svr4/usr/lib/ld.so)
-PKG_FAIL_REASON+=	'${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
-.    endif
-DISTNAME=	OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/packages
-.  elif ${MACHINE_ARCH} == "i386"
 DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/RPMS
-.  endif
+WRKSRC=		${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
 .endif
 
 .if ${OPSYS} == "DragonFly"
 DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/RPMS
+WRKSRC=		${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
 .endif
 
 .if ${OPSYS} == "Linux"
 .if ${ARCH} == "i386"
 DISTNAME=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC=		${WRKDIR}/OOF680_m14_native_packed-1_en-US.9134/RPMS
+WRKSRC=		${WRKDIR}/OOF680_m18_native_packed-1_en-US.9161
 .endif
 .endif
 
@@ -91,7 +83,7 @@ DISTNAME?=	OOo_${OO_RELEASE}_LinuxIntel_install_en-US
 
 do-install:
 	${RM} -f ${WRKDIR}/PLIST.nouniq
-	${RPM2PKG} ${RPM2PKGARGS} ${WRKSRC}/*.rpm
+	${RPM2PKG} ${RPM2PKGARGS} ${WRKSRC}/RPMS/*.rpm
 	uniq ${WRKDIR}/PLIST.nouniq >${WRKDIR}/PLIST
 .if defined(PKG_JVM) && !empty(PKG_JVM)
 	${RM} -f ${PREFIX}/bin/soffice
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
index 0a8ae962edc..a5e40f41f0b 100644
--- a/misc/openoffice2-bin/distinfo
+++ b/misc/openoffice2-bin/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.10 2007/04/06 13:42:25 ghen Exp $
+$NetBSD: distinfo,v 1.10.2.1 2007/06/23 23:32:10 salo Exp $
 
-SHA1 (OOo_2.2.0_LinuxIntel_install_en-US.tar.gz) = a2a04de16ab3bd9290178312339d5117f4511010
-RMD160 (OOo_2.2.0_LinuxIntel_install_en-US.tar.gz) = dba9b28c0d8ae8cef4b34dbab0ebd0b37a3d0595
-Size (OOo_2.2.0_LinuxIntel_install_en-US.tar.gz) = 131348495 bytes
-SHA1 (OOo_2.2.0_SolarisSparc_install_en-US.tar.gz) = 297452e2b11b698ee36306532a143452743b8e3c
-RMD160 (OOo_2.2.0_SolarisSparc_install_en-US.tar.gz) = a8efee0885055cb2fc2460262cc2a468dbb07ab6
-Size (OOo_2.2.0_SolarisSparc_install_en-US.tar.gz) = 131300806 bytes
-SHA1 (OOo_2.2.0_Solarisx86_install_en-US.tar.gz) = 3f0435cf590377f8c65c54f6a231c89d71fef3a1
-RMD160 (OOo_2.2.0_Solarisx86_install_en-US.tar.gz) = 5204bb8bbb791d4cdf4c784dbbec199c1a0dc11c
-Size (OOo_2.2.0_Solarisx86_install_en-US.tar.gz) = 121894989 bytes
+SHA1 (OOo_2.2.1_LinuxIntel_install_en-US.tar.gz) = 43c7a042c4f6e8eadfb63caed75d69548dd994c6
+RMD160 (OOo_2.2.1_LinuxIntel_install_en-US.tar.gz) = 3a9f8ea0c510a10f2026d68d1247fbf04d12a304
+Size (OOo_2.2.1_LinuxIntel_install_en-US.tar.gz) = 131624994 bytes