Wed Dec 2 22:21:16 2009 UTC ()
Update to OpenOffice.org 3.1.1.

Includes the following security fixes:
* CVE-2009-0200 / CVE-2009-0201: Manipulated Microsoft Word files can lead
  to heap overflows and arbitrary code execution
* CVE-2009-2414 / CVE-2009-2416: Manipulated XML documents can lead to
  arbitrary code execution

Too many changes since 3.0.1 to list them here.
Please consult: http://development.openoffice.org/releases/3.1.1.html


(bad)
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3-bin/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3-bin/distinfo
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3-bin/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3-bin/Attic/Makefile 2009/01/31 22:05:53 1.1.1.1
+++ pkgsrc/misc/openoffice3-bin/Attic/Makefile 2009/12/02 22:21:16 1.2
@@ -1,76 +1,81 @@ @@ -1,76 +1,81 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ 1# $NetBSD: Makefile,v 1.2 2009/12/02 22:21:16 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_RELEASE= 3.0.1 21OO_BASEVER= 3.1
 22OO_RELEASE= 3.1.1
22PLIST_SUBST+= VER=${OO_VER:Q} 23PLIST_SUBST+= VER=${OO_VER:Q}
23MESSAGE_SUBST+= VER=${OO_VER:Q} 24MESSAGE_SUBST+= VER=${OO_VER:Q}
24FILES_SUBST+= VER=${OO_VER:Q} 25FILES_SUBST+= VER=${OO_VER:Q}
25 26
26TEMP?= ${WRKSRC} 27TEMP?= ${WRKSRC}
27EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 28EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
28BUILD_DIRS= # empty 29BUILD_DIRS= # empty
29 30
30PLIST_SRC= ${PKGDIR}/PLIST.proglinks 31PLIST_SRC= ${PKGDIR}/PLIST.proglinks
31PLIST_SRC+= ${WRKDIR}/PLIST 32PLIST_SRC+= ${WRKDIR}/PLIST
32 33
33EMUL_PLATFORMS= linux-i386 34EMUL_PLATFORMS= linux-i386
34#EMUL_PLATFORMS+= solaris-i386 solaris-sparc 35#EMUL_PLATFORMS+= solaris-i386 solaris-sparc
35EMUL_MODULES.linux= compat freetype2 x11 36EMUL_MODULES.linux= compat freetype2 x11
36EMUL_REQD= suse>=10.0 37EMUL_REQD= suse>=10.0
37 38
38EMUL_PKG_FMT= rpm 39EMUL_PKG_FMT= rpm
39RPMFILES= ${WRKSRC}/RPMS/*.rpm 40RPMFILES= ${WRKSRC}/RPMS/*.rpm
40RPM2PKG_PREFIX= ${PREFIX} 41RPM2PKG_PREFIX= ${PREFIX}
41RPM2PKG_SUBPREFIX= # empty 42RPM2PKG_SUBPREFIX= # empty
42RPM2PKG_STAGE= do-install 43RPM2PKG_STAGE= do-install
43RUN_LDCONFIG= no 44RUN_LDCONFIG= no
44 45
45USE_TOOLS+= patch 46USE_TOOLS+= patch
46 47
 48CHECK_FILES_SKIP+= ${PREFIX}/openoffice.org/basis${OO_BASEVER}/ure-link
 49CHECK_FILES_SKIP+= ${PREFIX}/openoffice.org${OO_VER}/basis-link
 50
47.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
48 52
49.if ${EMUL_PLATFORM} == "linux-i386" 53.if ${EMUL_PLATFORM} == "linux-i386"
50DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US 54DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US
51WRKSRC= ${WRKDIR}/OOO300_m15_native_packed-1_en-US.9379 55WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420
52.elif ${EMUL_PLATFORM} == "solaris-i386" 56.elif ${EMUL_PLATFORM} == "solaris-i386"
53DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US 57DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US
54WRKSRC= ${WRKDIR}/OOO300_m15_native_packed-1_en-US.9379/packages 58WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages
55.elif ${EMUL_PLATFORM} == "solaris-sparc" 59.elif ${EMUL_PLATFORM} == "solaris-sparc"
56DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US 60DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US
57WRKSRC= ${WRKDIR}/OOO300_m15_native_packed-1_en-US.9379/packages 61WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages
58.endif 62.endif
59 63
60.include "options.mk" 64.include "options.mk"
61 65
62do-install: 66do-install:
63 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch 67 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch
 68 ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch
64 uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST 69 uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST
65.if defined(PKG_JVM) && !empty(PKG_JVM) 70.if defined(PKG_JVM) && !empty(PKG_JVM)
66 ${RM} -f ${PREFIX}/bin/soffice 71 ${RM} -f ${PREFIX}/bin/soffice
67 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \ 72 ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
68 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \ 73 -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
69 < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice 74 < ${FILESDIR}/soffice > ${PREFIX}/bin/soffice
70 ${CHMOD} +x ${PREFIX}/bin/soffice 75 ${CHMOD} +x ${PREFIX}/bin/soffice
71.else 76.else
72 ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice 77 ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${PREFIX}/bin/soffice
73.endif 78.endif
74.for i in scalc sdraw simpress smath spadmin swriter 79.for i in scalc sdraw simpress smath spadmin swriter
75 ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i} 80 ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${PREFIX}/bin/${i}
76.endfor 81.endfor
cvs diff -r1.1.1.1 -r1.2 pkgsrc/misc/openoffice3-bin/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/openoffice3-bin/Attic/distinfo 2009/01/31 22:05:53 1.1.1.1
+++ pkgsrc/misc/openoffice3-bin/Attic/distinfo 2009/12/02 22:21:16 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ 1$NetBSD: distinfo,v 1.2 2009/12/02 22:21:16 bad Exp $
2 2
3SHA1 (OOo_3.0.1_LinuxIntel_install_en-US.tar.gz) = 6d3754ccb27e2a4b58635bc37e002e76f19bb4c7 3SHA1 (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = 7adc85e257b0034ce3ac340e483da8f903ad7468
4RMD160 (OOo_3.0.1_LinuxIntel_install_en-US.tar.gz) = fbf71e7192934472b1e2e477dd86f1471751c7fe 4RMD160 (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = e11af9b5499becf468a4bfec432eb98a910dc7ca
5Size (OOo_3.0.1_LinuxIntel_install_en-US.tar.gz) = 155910588 bytes 5Size (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = 163290562 bytes