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

1 files changed, 17 insertions, 0 deletions

diff --git a/misc/openoffice2/patches/patch-cn b/misc/openoffice2/patches/patch-cn
new file mode 100644
index 00000000000..bf5e4c39ec6
--- /dev/null
+++ b/misc/openoffice2/patches/patch-cn
@@ -0,0 +1,17 @@
+$NetBSD: patch-cn,v 1.1.2.2 2007/06/25 15:37:47 salo Exp $
+
+--- desktop/scripts/soffice.sh.orig	2007-06-10 11:44:31.000000000 +0900
++++ desktop/scripts/soffice.sh	2007-06-10 11:45:05.000000000 +0900
+@@ -55,6 +55,12 @@
+     export JITC_PROCESSOR_TYPE
+ fi
+ 
++# XXX: Ignore "unlocking unlocked mutex" error.
++if [ $sd_platform = "NetBSD" ]; then
++    PTHREAD_DIAGASSERT=AEL
++    export PTHREAD_DIAGASSERT
++fi
++
+ # set -x
+ 
+ # resolve installation directory