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

2 files changed, 19 insertions, 20 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 3db4895fce0..2695ffc843b 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/06/14 14:31:12 hira Exp $
+# $NetBSD: Makefile,v 1.21 2007/06/22 03:52:20 hira Exp $
 #
 
-OO_VER=			2.2.0
-PKGREVISION=		5
+OO_VER=			2.2.1
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
 CATEGORIES=		misc
@@ -29,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).
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 5e6ee80c4a9..f5e5c1a8069 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.19 2007/06/15 17:00:28 hira Exp $
+$NetBSD: distinfo,v 1.20 2007/06/22 03:52:20 hira Exp $
 
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1
-Size (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 7763249 bytes
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = a3b334c6a855366944e9e1e441a5fbe2f2d7bcb1
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = 84e2bfaad21760c5a92a73aac46765ed01638ffa
-Size (openoffice-2.2.0/OOo_2.2.0_src_core.tar.bz2) = 123160673 bytes
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = fdb120f18310efb95938cdf30a0855ef8456d346
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = 8b66d4e05ebfbc673eac3a5326f88d5ba0a3e7b2
-Size (openoffice-2.2.0/OOo_2.2.0_src_l10n.tar.bz2) = 76592096 bytes
-SHA1 (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 311331016cbc6112e0cf9829d6ef6782acccc01b
-RMD160 (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 90ef3a39896a15afc75094c5366f72a0a3237916
-Size (openoffice-2.2.0/OOo_2.2.0_src_system.tar.bz2) = 30976956 bytes
-SHA1 (openoffice-2.2.0/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
-RMD160 (openoffice-2.2.0/bridge.h) = 191fb56e56df85d49651988290d20db914670951
-Size (openoffice-2.2.0/bridge.h) = 6734 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = aa2c316e0fab13a25c07c2cfd0eafb7a50c96678
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = a6194849bb8e2130709a7ff769a8e751a43f86c6
+Size (openoffice-2.2.1/OOo_2.2.1_src_binfilter.tar.bz2) = 7756778 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = dad86ea3e8ed2805986c82333cf7a12040696269
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = fa6775f397bf093ad5be19c28c18d179bb1057b8
+Size (openoffice-2.2.1/OOo_2.2.1_src_core.tar.bz2) = 123479583 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = f7c1592210c60313464b7f2cec88cb850578aec1
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = 58f56faab079f179348f4c64cdbe176e296345f7
+Size (openoffice-2.2.1/OOo_2.2.1_src_l10n.tar.bz2) = 76560727 bytes
+SHA1 (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 295c70a94d37b811c4ad3f437c58e564c979ad51
+RMD160 (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 0487071a7f2cb92122984e5d928b2d7b4b55b85f
+Size (openoffice-2.2.1/OOo_2.2.1_src_system.tar.bz2) = 31149966 bytes
+SHA1 (openoffice-2.2.1/bridge.h) = c6db3e96432f27f15a753a65c6bf2e97e64f566a
+RMD160 (openoffice-2.2.1/bridge.h) = 191fb56e56df85d49651988290d20db914670951
+Size (openoffice-2.2.1/bridge.h) = 6734 bytes
 SHA1 (patch-aa) = 352774b0e509f41787573594b8f8f8bbe72d6824
 SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
 SHA1 (patch-ad) = 10d348282a4e5e6907e4e2cd828997f4549be58c