summaryrefslogtreecommitdiff
path: root/misc/openoffice2/Makefile
diff options
context:
space:
mode:
authorhira <hira@pkgsrc.org>2009-09-13 03:54:13 +0000
committerhira <hira@pkgsrc.org>2009-09-13 03:54:13 +0000
commitd9854555886d5124347e6003f61964f53cc6636b (patch)
tree8ff19d8c85252a6725a90eb22d902a82f6c9040e /misc/openoffice2/Makefile
parent3cf21f9dfd41c64024da0f2480dd7208d209c41f (diff)
downloadpkgsrc-d9854555886d5124347e6003f61964f53cc6636b.tar.gz
Update to 2.4.3. This is bug fix release. It fixes the following
security vulnerabilities. * 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 Release notes: http://development.openoffice.org/releases/2.4.3.html - Fix getline() problem (patches from misc/openoffice3/patches). - Use internal neon (9 patches are required to use external neon). - Use internal openssl for internal neon. - Disable VBA extension (enabling this causes build error).
Diffstat (limited to 'misc/openoffice2/Makefile')
-rw-r--r--misc/openoffice2/Makefile13
1 files changed, 4 insertions, 9 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 2b07e475241..0062f13d570 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.73 2009/09/10 00:27:08 tnn Exp $
+# $NetBSD: Makefile,v 1.74 2009/09/13 03:54:13 hira Exp $
#
-OO_VER= 2.4.2
+OO_VER= 2.4.3
DISTNAME= openoffice-${OO_VER}
PKGNAME= openoffice2-${OO_VER}
-PKGREVISION= 12
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
DIST_SUBDIR= ${DISTNAME}
@@ -30,7 +29,7 @@ DEPENDS+= libpaper-[0-9]*:../../print/libpaper
.include "../../mk/bsd.prefs.mk"
-WRKSRC= ${WRKDIR}/OOH680_m18
+WRKSRC= ${WRKDIR}/OOH680_m21
CONFIGURE_DIRS= config_office
# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
@@ -89,12 +88,12 @@ CONFIGURE_ENV+= BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk
CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode
CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn
-CONFIGURE_ENV+= USE_BUILTIN_openssl=${USE_BUILTIN.openssl}
CONFIGURE_ARGS+= --with-use-shell=bash
CONFIGURE_ARGS+= --enable-binfilter
CONFIGURE_ARGS+= --enable-cairo
CONFIGURE_ARGS+= --disable-ldap
+CONFIGURE_ARGS+= --disable-vba
CONFIGURE_ARGS+= --with-system-stdlibs
CONFIGURE_ARGS+= --with-system-curl
CONFIGURE_ARGS+= --with-system-db
@@ -104,8 +103,6 @@ CONFIGURE_ARGS+= --with-system-icu
CONFIGURE_ARGS+= --with-system-jpeg
CONFIGURE_ARGS+= --with-system-libxml2
CONFIGURE_ARGS+= --with-system-libxslt
-CONFIGURE_ARGS+= --with-system-neon
-CONFIGURE_ARGS+= --with-system-openssl
CONFIGURE_ARGS+= --with-system-python
CONFIGURE_ARGS+= --with-system-zlib
CONFIGURE_ARGS+= --with-dynamic-xinerama
@@ -195,13 +192,11 @@ post-install:
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
-.include "../../www/neon/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"