diff options
author | salo <salo> | 2007-06-25 15:37:45 +0000 |
---|---|---|
committer | salo <salo> | 2007-06-25 15:37:45 +0000 |
commit | 1a1beac15298a831917a878c01351cc6c8fd390b (patch) | |
tree | 82fd71613bd0a9684dd01342fc81917f7c96248d /misc/openoffice2/Makefile | |
parent | 4d32692eb770ffc9b2f1f629138f980fc3336c18 (diff) | |
download | pkgsrc-1a1beac15298a831917a878c01351cc6c8fd390b.tar.gz |
Pullup ticket 2117 - requested by lkundrak
security update for openoffice2
Updated via patch from hira, the MAINTAINER.
Module Name: pkgsrc
Committed By: hira
Date: Fri Jun 22 03:52:21 UTC 2007
Modified Files:
pkgsrc/misc/openoffice2: Makefile distinfo
Log Message:
Update to 2.2.1 during freeze because of security fixes (CVE-2007-0245
and CVE-2007-2754).
Changes from 2.2.0:
* freetypettg: fix CVE-2007-2754 for the internal freetype copy
* autotext02: A showstopper fix for OOo2.2.1
* l10n77316fix: contains fix for i77316
* notepaint: Fix for invisible text in Calc notes while editing
* macosxpbuildrepair_OOF680:
This cws fixes broken Mac OS X 10.3 build, and does contain :
- a fix for a build breaker in slideshow ( fixed by thb ) #i74325#
- gcc-3.3 parser fixes #i75990#
- a complete fix in sal for security.c ( with sb help ) #i76159#
- a fix for broken linking ( because of extra symbols, due to bad
filtering ) #i72922#
- a fix for main.applescript ( build borken on Panther ) #i75972#
All issue targeted 2.2.1 ( supposing the changes will be integrated
in SRC680 too)
* ause078_OOF680: quick and small to get back correct dependencies
* os95_OOF680,plthes: add license-fixed polish thesaurus
* olenoserver: A fix for a regression.
* hro15: Unicode command line support fix for Windows only.
* custompropsfix: Small bug fix in Word import for import of document
variables
* dba221b: fix issue 73722, in its incarnation as issue 76434, for 2.2.1.
* swvalgrind: Fix for i76133
* calc221: Calc fixes for OOo2.2.1
* fix75967: fix issue 75967
* c03v8,c07v012,native86,nativebroffice: New Product BrOffice.org
* impress120: Bugfix workspace for OOo 2.2.1
sj->wg: the performance test hasn|t been finished yet, but I think
it should be no problem to hand over this issue without the test.
* larsbehr01: Bugfix for i66661: Slideshow bug fixing for 2.2.1
* dba221a: ongoing DBA-related bugfixing towards OOo 2.2.1
* sch17: Fixes for sch
* tbe29: OOo 2.2.1 accessibility bug fixes
* impress119: Bug fixes for OOo 2.2.1.
* printhelpfix: Bugfix for 134037.
* autotext01: A showstopper cws related to autotext bug.
* native79: Preparing OOo 2.2.1 and SO 8 Update 7
* vcl73_OOF680: 2.2.1 issues
* cmcfixes32_OOF680: minor customized build fixes
* jl57_OOF680: Contains a patch for building with an older gcc compiler.
* fsfixes06_OOF680: Fix for a bug in WordPerfect typedetection that caused
us to crash on unsupported documents instead of refusing
them with grace
* jl62,oasisrng02: Fixes of violations of the RelaxNG schema in ODF.
* aw050: OOo 2.2.1 BugFixing
* swqbugfix01: Issues in Writer regarding saving of documents
Diffstat (limited to 'misc/openoffice2/Makefile')
-rw-r--r-- | misc/openoffice2/Makefile | 76 |
1 files changed, 44 insertions, 32 deletions
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile index 11337282885..b56fe45ba3a 100644 --- a/misc/openoffice2/Makefile +++ b/misc/openoffice2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2007/04/05 23:24:01 hira Exp $ +# $NetBSD: Makefile,v 1.14.2.1 2007/06/25 15:37:45 salo Exp $ # -OO_VER= 2.2.0 +OO_VER= 2.2.1 DISTNAME= openoffice-${OO_VER} PKGNAME= openoffice2-${OO_VER} CATEGORIES= misc @@ -28,7 +28,7 @@ BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip .include "../../mk/bsd.prefs.mk" -WRKSRC= ${WRKDIR}/OOF680_m14 +WRKSRC= ${WRKDIR}/OOF680_m18 CONFIGURE_DIRS= config_office # Cannot compile with 3.3.x (GCC Bugzilla Bug 16879). @@ -48,6 +48,7 @@ CONFLICTS+= openoffice-linux-[0-9]* ONLY_FOR_PLATFORM= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386 GNU_CONFIGURE= yes +CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q} CONFIGURE_ARGS+= --with-use-shell=bash CONFIGURE_ARGS+= --enable-binfilter CONFIGURE_ARGS+= --enable-cairo @@ -61,64 +62,75 @@ CONFIGURE_ARGS+= --enable-epm --with-package-format=portable # XXX: Error in OOo internal libsndfile. CONFIGURE_ARGS+= --disable-pasf --without-nas +# systray quickstarter is broken with mutex handling. +CONFIGURE_ARGS+= --disable-systray + # Disable Java. CONFIGURE_ARGS+= --without-java --disable-odk --disable-gcjaot # NOTE: In this version, this value should be separated by space (comma # causes build error). -CONFIGURE_ARGS+= --with-lang=${OPENOFFICE_LANGUAGE} +CONFIGURE_ARGS+= --with-lang=${OO_LANGS:Q} .include "options.mk" UNLIMIT_RESOURCES+= datasize -OPENOFFICE_VERSION= OpenOffice.org${OO_VER} +OO_RELEASE= OpenOffice.org${OO_VER} PLIST_SRC+= ${WRKDIR}/.PLIST_SRC -MESSAGE_SUBST+= OPENOFFICE_VERSION=${OPENOFFICE_VERSION} +MESSAGE_SUBST+= OO_RELEASE=${OO_RELEASE} INSTALLATION_DIRS= bin -SUBST_CLASSES+= X11_LDFLAGS -SUBST_MESSAGE.X11_LDFLAGS= Adding X11_LDFLAGS. -SUBST_STAGE.X11_LDFLAGS= post-patch -SUBST_FILES.X11_LDFLAGS= solenv/inc/${OPENOFFICE_OUTPATH:Q}.mk -SUBST_SED.X11_LDFLAGS= -e 's|@X11_LDFLAGS@|${X11_LDFLAGS}|g' - -OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install/${OPENOFFICE_LANGUAGE} -OO_PKGROOT= /opt/openoffice.org2.2 -OO_PROGRAMS= scalc sdraw simpress soffice swriter +OO_UNXNAME= openoffice.org2.2 +OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install +OO_PKGROOT= /opt/${OO_UNXNAME} +OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/bridge.h \ ${WRKSRC}/bridges/inc/bridges/cpp_uno/ do-build: - ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "export PTHREAD_DIAGASSERT=Ael && cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all" + ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && dmake build_all" post-build: - cd ${WRKDIR} && \ - ${RM} -fr opt && \ - for f in ${OO_PKGPATH:Q}/*/*.sw; do \ - ${TAR} xpf $$f; \ + cd ${WRKDIR} && \ + ${RM} -fr opt && \ + for l in ${OO_LANGS}; do \ + for f in ${OO_PKGPATH:Q}/$${l}/*/*.sw; do \ + ${TAR} xpfk $$f; \ + done; \ done + ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME} + ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/soffice \"\$$@\"" \ + >> ${WRKDIR}/${OO_UNXNAME} + ${ECHO} "#!${SH}" > ${WRKDIR}/${OO_UNXNAME}-printeradmin + ${ECHO} "exec ${PREFIX}/${OO_RELEASE}/program/spadmin" \ + >> ${WRKDIR}/${OO_UNXNAME}-printeradmin do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/${OPENOFFICE_VERSION} - cd ${WRKDIR}${OO_PKGROOT} && \ - ${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OPENOFFICE_VERSION} - - for f in ${OO_PROGRAMS}; do \ - ${LN} -sf ${PREFIX}/${OPENOFFICE_VERSION}/program/$$f \ - ${PREFIX}/bin/$$f; \ + ${INSTALL_DATA_DIR} ${PREFIX}/${OO_RELEASE} + cd ${WRKDIR}${OO_PKGROOT} && \ + ${TAR} cf - . | ${TAR} Cxpf ${PREFIX}/${OO_RELEASE} - + for f in ${OO_PROGRAMS}; do \ + ${LN} -sf ${PREFIX}/${OO_RELEASE}/program/$$f \ + ${PREFIX}/bin/$$f; \ done + ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${OO_UNXNAME}-printeradmin \ + ${PREFIX}/bin post-install: - cd ${PREFIX} && \ - ${FIND} ${OPENOFFICE_VERSION} \! -type d -print | \ - ${SORT} > ${PLIST_SRC} && \ - ${FIND} ${OPENOFFICE_VERSION} -type d -print | ${SORT} -r | \ + cd ${PREFIX} && \ + ${FIND} ${OO_RELEASE} \! -type d -print | \ + ${SORT} > ${PLIST_SRC} && \ + ${FIND} ${OO_RELEASE} -type d -print | ${SORT} -r | \ ${AWK} '{print("@dirrm "$$1)}' >> ${PLIST_SRC} - for f in ${OO_PROGRAMS}; do \ - ${ECHO} bin/$$f >> ${PLIST_SRC}; \ + for f in ${OO_PROGRAMS}; do \ + ${ECHO} bin/$$f >> ${PLIST_SRC}; \ done + ${ECHO} bin/${OO_UNXNAME} >> ${PLIST_SRC} + ${ECHO} bin/${OO_UNXNAME}-printeradmin >> ${PLIST_SRC} # everything specific to your OS/Arch goes into its own Makefile # group together i386, i486, i586 and i686 (for Linux) |