diff options
| author | bad <bad@pkgsrc.org> | 2009-12-02 22:21:16 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2009-12-02 22:21:16 +0000 |
| commit | 683d9e58e80cf879509c089fdd1e14fc36e1a0d3 (patch) | |
| tree | 0b6e29e60670892b8b5072190709603253301ce6 /misc | |
| parent | 2c8e50e54736197006840646c0b7048f962061d7 (diff) | |
| download | pkgsrc-683d9e58e80cf879509c089fdd1e14fc36e1a0d3.tar.gz | |
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
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice3-bin/Makefile | 15 | ||||
| -rw-r--r-- | misc/openoffice3-bin/distinfo | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/misc/openoffice3-bin/Makefile b/misc/openoffice3-bin/Makefile index d86c847acc6..848cb1af464 100644 --- a/misc/openoffice3-bin/Makefile +++ b/misc/openoffice3-bin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ +# $NetBSD: Makefile,v 1.2 2009/12/02 22:21:16 bad Exp $ DISTNAME= openoffice3-bin # overridden below PKGNAME= openoffice3-bin-${OO_RELEASE} @@ -18,7 +18,8 @@ CONFLICTS+= openoffice3-[0-9]* CONFLICTS+= openoffice-linux-[0-9]* OO_VER= 3 -OO_RELEASE= 3.0.1 +OO_BASEVER= 3.1 +OO_RELEASE= 3.1.1 PLIST_SUBST+= VER=${OO_VER:Q} MESSAGE_SUBST+= VER=${OO_VER:Q} FILES_SUBST+= VER=${OO_VER:Q} @@ -44,23 +45,27 @@ RUN_LDCONFIG= no USE_TOOLS+= patch +CHECK_FILES_SKIP+= ${PREFIX}/openoffice.org/basis${OO_BASEVER}/ure-link +CHECK_FILES_SKIP+= ${PREFIX}/openoffice.org${OO_VER}/basis-link + .include "../../mk/bsd.prefs.mk" .if ${EMUL_PLATFORM} == "linux-i386" DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US -WRKSRC= ${WRKDIR}/OOO300_m15_native_packed-1_en-US.9379 +WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420 .elif ${EMUL_PLATFORM} == "solaris-i386" DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US -WRKSRC= ${WRKDIR}/OOO300_m15_native_packed-1_en-US.9379/packages +WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages .elif ${EMUL_PLATFORM} == "solaris-sparc" DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US -WRKSRC= ${WRKDIR}/OOO300_m15_native_packed-1_en-US.9379/packages +WRKSRC= ${WRKDIR}/OOO310_m19_native_packed-1_en-US.9420/packages .endif .include "options.mk" do-install: ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/soffice-patch + ${PATCH} -d ${PREFIX}/openoffice.org${OO_VER}/program < ${FILESDIR}/spadmin-patch uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST .if defined(PKG_JVM) && !empty(PKG_JVM) ${RM} -f ${PREFIX}/bin/soffice diff --git a/misc/openoffice3-bin/distinfo b/misc/openoffice3-bin/distinfo index a0235a643ab..94d0fcb3b55 100644 --- a/misc/openoffice3-bin/distinfo +++ b/misc/openoffice3-bin/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/01/31 22:05:53 bad Exp $ +$NetBSD: distinfo,v 1.2 2009/12/02 22:21:16 bad Exp $ -SHA1 (OOo_3.0.1_LinuxIntel_install_en-US.tar.gz) = 6d3754ccb27e2a4b58635bc37e002e76f19bb4c7 -RMD160 (OOo_3.0.1_LinuxIntel_install_en-US.tar.gz) = fbf71e7192934472b1e2e477dd86f1471751c7fe -Size (OOo_3.0.1_LinuxIntel_install_en-US.tar.gz) = 155910588 bytes +SHA1 (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = 7adc85e257b0034ce3ac340e483da8f903ad7468 +RMD160 (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = e11af9b5499becf468a4bfec432eb98a910dc7ca +Size (OOo_3.1.1_LinuxIntel_install_en-US.tar.gz) = 163290562 bytes |