Tue Jun 15 16:48:19 2010 UTC ()
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.


(bad)
diff -r1.6 -r1.7 pkgsrc/misc/openoffice3-bin/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/openoffice3-bin/distinfo
cvs diff -r1.6 -r1.7 pkgsrc/misc/openoffice3-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3-bin/Attic/Makefile 2010/04/07 18:04:46 1.6
+++ pkgsrc/misc/openoffice3-bin/Attic/Makefile 2010/06/15 16:48:19 1.7
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.6 2010/04/07 18:04:46 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2010/06/15 16:48:19 bad Exp $
2 2
3DISTNAME= openoffice3-bin # overridden below 3DISTNAME= openoffice3-bin # overridden below
4PKGNAME= openoffice3-bin-${OO_RELEASE} 4PKGNAME= openoffice3-bin-${OO_RELEASE}
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/} 6MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
7 7
8MAINTAINER= bad@NetBSD.org 8MAINTAINER= bad@NetBSD.org
9HOMEPAGE= http://www.openoffice.org/ 9HOMEPAGE= http://www.openoffice.org/
10COMMENT= Integrated office productivity suite (binary pkg) 10COMMENT= Integrated office productivity suite (binary pkg)
11 11
12CONFLICTS+= staroffice-[0-9]* 12CONFLICTS+= staroffice-[0-9]*
13CONFLICTS+= openoffice-[0-9]* 13CONFLICTS+= openoffice-[0-9]*
14CONFLICTS+= openoffice-bin-[0-9]* 14CONFLICTS+= openoffice-bin-[0-9]*
15CONFLICTS+= openoffice2-bin-[0-9]* 15CONFLICTS+= openoffice2-bin-[0-9]*
16CONFLICTS+= openoffice2-[0-9]* 16CONFLICTS+= openoffice2-[0-9]*
17CONFLICTS+= openoffice3-[0-9]* 17CONFLICTS+= openoffice3-[0-9]*
18CONFLICTS+= openoffice-linux-[0-9]* 18CONFLICTS+= openoffice-linux-[0-9]*
19 19
20OO_VER= 3 20OO_VER= 3
21OO_BASEVER= 3.2 21OO_BASEVER= 3.2
22OO_RELEASE= 3.2.0 22OO_RELEASE= 3.2.1
23PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q} 23PLIST_SUBST+= VER=${OO_VER:Q} BASEVER=${OO_BASEVER:Q}
24MESSAGE_SUBST+= VER=${OO_VER:Q} 24MESSAGE_SUBST+= VER=${OO_VER:Q}
25FILES_SUBST+= VER=${OO_VER:Q} 25FILES_SUBST+= VER=${OO_VER:Q}
26 26
27TEMP?= ${WRKSRC} 27TEMP?= ${WRKSRC}
28EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 28EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
29BUILD_DIRS= # empty 29BUILD_DIRS= # empty
30 30
31PLIST_SRC= ${PKGDIR}/PLIST.proglinks 31PLIST_SRC= ${PKGDIR}/PLIST.proglinks
32PLIST_SRC+= ${WRKDIR}/PLIST 32PLIST_SRC+= ${WRKDIR}/PLIST
33PLIST_SRC+= ${PKGDIR}/PLIST.dirs 33PLIST_SRC+= ${PKGDIR}/PLIST.dirs
34 34
35EMUL_PLATFORMS= linux-i386 35EMUL_PLATFORMS= linux-i386
@@ -44,34 +44,34 @@ RPM2PKG_SUBPREFIX= # empty @@ -44,34 +44,34 @@ RPM2PKG_SUBPREFIX= # empty
44RPM2PKG_STAGE= do-install 44RPM2PKG_STAGE= do-install
45RUN_LDCONFIG= no 45RUN_LDCONFIG= no
46 46
47USE_TOOLS+= patch 47USE_TOOLS+= patch
48 48
49CHECK_FILES_SKIP+= ${PREFIX}/opt/openoffice.org/basis${OO_BASEVER}/ure-link 49CHECK_FILES_SKIP+= ${PREFIX}/opt/openoffice.org/basis${OO_BASEVER}/ure-link
50CHECK_FILES_SKIP+= ${PREFIX}/opt/openoffice.org${OO_VER}/basis-link 50CHECK_FILES_SKIP+= ${PREFIX}/opt/openoffice.org${OO_VER}/basis-link
51 51
52PKG_DESTDIR_SUPPORT= user-destdir 52PKG_DESTDIR_SUPPORT= user-destdir
53 53
54.include "../../mk/bsd.prefs.mk" 54.include "../../mk/bsd.prefs.mk"
55 55
56.if ${EMUL_PLATFORM} == "linux-i386" 56.if ${EMUL_PLATFORM} == "linux-i386"
57DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US 57DISTNAME= OOo_${OO_RELEASE}_Linux_x86_install-rpm_en-US
58WRKSRC= ${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483 58WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502
59.elif ${EMUL_PLATFORM} == "solaris-i386" 59.elif ${EMUL_PLATFORM} == "solaris-i386"
60DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US 60DISTNAME= OOo_${OO_RELEASE}_Solaris_x86_install_en-US
61WRKSRC= ${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483/packages 61WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
62.elif ${EMUL_PLATFORM} == "solaris-sparc" 62.elif ${EMUL_PLATFORM} == "solaris-sparc"
63DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US 63DISTNAME= OOo_${OO_RELEASE}_Solaris_Sparc_install_en-US
64WRKSRC= ${WRKDIR}/OOO320_m12_native_packed-1_en-US.9483/packages 64WRKSRC= ${WRKDIR}/OOO320_m18_native_packed-1_en-US.9502/packages
65.endif 65.endif
66 66
67.include "options.mk" 67.include "options.mk"
68 68
69INSTALLATION_DIRS= bin 69INSTALLATION_DIRS= bin
70 70
71do-install: 71do-install:
72 ${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch 72 ${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch
73 ${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/soffice.orig 73 ${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/soffice.orig
74 ${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch 74 ${PATCH} -d ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch
75 ${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/spadmin.orig 75 ${RM} -f ${DESTDIR}${PREFIX}/opt/openoffice.org${OO_VER}/program/spadmin.orig
76 uniq ${RPM2PKG_PLIST} | \ 76 uniq ${RPM2PKG_PLIST} | \
77 sed -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST 77 sed -e 's,^@exec mkdir -m 755 -p %D/,@pkgdir,' > ${WRKDIR}/PLIST
cvs diff -r1.3 -r1.4 pkgsrc/misc/openoffice3-bin/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3-bin/Attic/distinfo 2010/03/02 22:57:03 1.3
+++ pkgsrc/misc/openoffice3-bin/Attic/distinfo 2010/06/15 16:48:19 1.4
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.3 2010/03/02 22:57:03 bad Exp $ 1$NetBSD: distinfo,v 1.4 2010/06/15 16:48:19 bad Exp $
2 2
3SHA1 (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 8edcdf677aeee84eea2cecf896bcdd30bcd98a45 3SHA1 (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = 4848b76debd50b3ec063d2b74f11cfa6a710f000
4RMD160 (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 0dc745ecbba13cb5a58e1ad322008c8b309b588f 4RMD160 (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = ae7cd0255c9b51f73500c3133eba036d42b556a5
5Size (OOo_3.2.0_LinuxIntel_install_en-US.tar.gz) = 154346578 bytes 5Size (OOo_3.2.1_Linux_x86_install-rpm_en-US.tar.gz) = 153892134 bytes