Revision bump for 2.2.1 as we still have build problems on ppc. This incorporates the security fix which is in 2.3.0

(Portage version: 2.1.3.9)

4 files changed, 182 insertions, 0 deletions

diff --git a/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff b/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff
new file mode 100644
index 000000000000..ec8a0a25e101
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff
@@ -0,0 +1,36 @@
+--- bin/package-ooo 
++++ bin/package-ooo 
+@@ -57,6 +57,7 @@
+ #!/bin/sh
+ export OOO_EXTRA_ARG='$2'
++unset PYTHONPATH
+ $OOINSTBASE/program/ooqstart $3 "\$@"
+ EOT
+     chmod 755 $1
+ }
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -904,6 +904,13 @@
+ 
+ # JavaUNOHelperServices.class must be built before juh.jar is created
+ javaunohelper-deps.diff, i#77465, pmladek
++
++# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
++# Debian #442338, Debian #442368
++ucb-no-CURL_NO_OLDIES.diff
++
++# security fix
++itiff.diff
+ 
+ [ MandrivaOnly ]
+ SectionOwner => gghibo
+@@ -1185,6 +1185,8 @@
+ system-db-check.diff, i#65979, hmth
+ # User ~/.ooo-2.0 as user dir
+ scp2-user-config-ooo-2.0.diff, pmladek
++# Fix visbility issue with gcc-4.2
++swregion-gcc42.diff, i#78417, aprosky
+ 
+ [ DebianBaseOnly ]
+ SectionOwner => rengelha
+
diff --git a/app-office/openoffice/files/2.2.1/itiff.diff b/app-office/openoffice/files/2.2.1/itiff.diff
new file mode 100644
index 000000000000..ab1f3a3e764f
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/itiff.diff
@@ -0,0 +1,88 @@
+--- goodies/source/filter.vcl/itiff/itiff.cxx-old	2007-06-21 14:17:54.000000000 +0100
++++ goodies/source/filter.vcl/itiff/itiff.cxx	2007-06-21 14:18:01.000000000 +0100
+@@ -154,7 +154,7 @@
+ 	double	ReadDoubleData();
+ 
+ 	void	ReadHeader();
+-	void	ReadTagData( USHORT nTagType, ULONG nDataLen );
++	void	ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
+ 
+ 	BOOL	ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
+ 		// Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
+@@ -310,7 +310,7 @@
+ 
+ // ---------------------------------------------------------------------------------
+ 
+-void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
++void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
+ {
+ 	if ( bStatus == FALSE )
+ 		return;
+@@ -373,16 +373,25 @@
+ 		case 0x0111: { // Strip Offset(s)
+ 			ULONG nOldNumSO, i, * pOldSO;
+ 			pOldSO = pStripOffsets;
+-			if ( pOldSO == NULL ) nNumStripOffsets = 0;	// Sicherheitshalber
++			if ( pOldSO == NULL )
++				nNumStripOffsets = 0;
+ 			nOldNumSO = nNumStripOffsets;
+-			nNumStripOffsets += nDataLen;
+-			pStripOffsets = new ULONG[ nNumStripOffsets ];
+-			for ( i = 0; i < nOldNumSO; i++ )
+-				pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
+-			for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
+-				pStripOffsets[ i ] = ReadIntData() + nOrigPos;
+-			if ( pOldSO != NULL )
++			nDataLen += nOldNumSO;
++			if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
++			{
++				nNumStripOffsets = nDataLen;
++				pStripOffsets = new ULONG[ nNumStripOffsets ];
++				if ( !pStripOffsets )
++					nNumStripOffsets = 0;
++				else
++				{
++					for ( i = 0; i < nOldNumSO; i++ )
++						pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
++					for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
++						pStripOffsets[ i ] = ReadIntData() + nOrigPos;
++				}
+ 				delete[] pOldSO;
++			}
+ 			OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
+ 			break;
+ 		}
+@@ -404,16 +413,25 @@
+ 		case 0x0117: { // Strip Byte Counts
+ 			ULONG nOldNumSBC, i, * pOldSBC;
+ 			pOldSBC = pStripByteCounts;
+-			if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
++			if ( pOldSBC == NULL )
++				nNumStripByteCounts = 0; // Sicherheitshalber
+ 			nOldNumSBC = nNumStripByteCounts;
+-			nNumStripByteCounts += nDataLen;
+-			pStripByteCounts = new ULONG[ nNumStripByteCounts ];
+-			for ( i = 0; i < nOldNumSBC; i++ )
+-				pStripByteCounts[ i ] = pOldSBC[ i ];
+-			for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
+-				pStripByteCounts[ i ] = ReadIntData();
+-			if ( pOldSBC != NULL )
++			nDataLen += nOldNumSBC;
++			if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
++			{		
++				nNumStripByteCounts = nDataLen;
++				pStripByteCounts = new ULONG[ nNumStripByteCounts ];
++				if ( !nNumStripByteCounts )
++					nNumStripByteCounts = 0;
++				else
++				{
++					for ( i = 0; i < nOldNumSBC; i++ )
++						pStripByteCounts[ i ] = pOldSBC[ i ];
++					for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
++						pStripByteCounts[ i ] = ReadIntData();
++				}
+ 				delete[] pOldSBC;
++			}
+ 			OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
+ 			break;
+ 		}
diff --git a/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff b/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff
new file mode 100644
index 000000000000..4ec2d7a0e514
--- /dev/null
+++ b/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff
@@ -0,0 +1,19 @@
+Index: source/ucp/ftp/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
+retrieving revision 1.13
+retrieving revision 1.12
+diff -u -u -r1.13 -r1.12
+--- ucb/source/ucp/ftp/makefile.mk	20 Sep 2004 14:32:42 -0000	1.13
++++ ucb/source/ucp/ftp/makefile.mk	2 Feb 2004 18:36:22 -0000	1.12
+@@ -75,9 +75,7 @@
+ 
+ .INCLUDE: settings.mk
+ 
+-.IF "$(SYSTEM_CURL)" == "YES"
+-CFLAGS+=-DCURL_NO_OLDIES
+-.ENDIF
++#CFLAGS +=-fno-inline
+ 
+ # --- General -----------------------------------------------------
+ 
diff --git a/app-office/openoffice/files/digest-openoffice-2.2.1-r1 b/app-office/openoffice/files/digest-openoffice-2.2.1-r1
new file mode 100644
index 000000000000..de6a736ea34a
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-2.2.1-r1
@@ -0,0 +1,39 @@
+MD5 d26766597ec92e7e397d7d7b6f644f7f OOo_2.2.1_src_binfilter.tar.bz2 7756778
+RMD160 a6194849bb8e2130709a7ff769a8e751a43f86c6 OOo_2.2.1_src_binfilter.tar.bz2 7756778
+SHA256 13f2f6dad82a085a60724fa6dbc58c564a8c496cc27189af3cd7286a6e6adeb8 OOo_2.2.1_src_binfilter.tar.bz2 7756778
+MD5 35d4037ce3a4d19bf52ba72c68ef6756 OOo_2.2.1_src_core.tar.bz2 123479583
+RMD160 fa6775f397bf093ad5be19c28c18d179bb1057b8 OOo_2.2.1_src_core.tar.bz2 123479583
+SHA256 adc54c88892f5ced9887945709856efeb628fe5f7b5b2f2aa7797c5391b9c7d6 OOo_2.2.1_src_core.tar.bz2 123479583
+MD5 23267d74b4a2a20d3c5ea098953c7ae4 OOo_2.2.1_src_l10n.tar.bz2 76560727
+RMD160 58f56faab079f179348f4c64cdbe176e296345f7 OOo_2.2.1_src_l10n.tar.bz2 76560727
+SHA256 d23cc1d5dc97533b03b04336e2a136ee4a359b2bd8239a008bd3e4508eae2b25 OOo_2.2.1_src_l10n.tar.bz2 76560727
+MD5 ece5727515916119aade371236bbfed6 OOo_2.2.1_src_sdk.tar.bz2 29291551
+RMD160 4811c952713526efe7e98090fee58b75e1aca7a3 OOo_2.2.1_src_sdk.tar.bz2 29291551
+SHA256 7d9e28ce43c52b08864e917709b5a6567543c2538b069fe7e3dfb1dd71796415 OOo_2.2.1_src_sdk.tar.bz2 29291551
+MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
+RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
+SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
+MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
+RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
+SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
+MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
+RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
+SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
+MD5 cfdc5e1fe2a559d458cf2a3fd3a52d8f libwpg-0.1.0~cvs20070608.tar.gz 396554
+RMD160 4ba3f5286ccc0fdea3962912a8f27dbd20f0feda libwpg-0.1.0~cvs20070608.tar.gz 396554
+SHA256 9d7c85a2c494260fe12fb0ec4e64c2670c5bb0e4abe167f032b72ea586f52903 libwpg-0.1.0~cvs20070608.tar.gz 396554
+MD5 2e442485100f7e00685737513f853546 libwps-0.1.0~svn20070129.tar.gz 426668
+RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 libwps-0.1.0~svn20070129.tar.gz 426668
+SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0.1.0~svn20070129.tar.gz 426668
+MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
+RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
+SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
+MD5 06c4210179b51035ce6a38690a26d909 ooo-build-2.2.1.tar.gz 4845814
+RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 ooo-build-2.2.1.tar.gz 4845814
+SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d ooo-build-2.2.1.tar.gz 4845814
+MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
+RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
+SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
+MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
+RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
+SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516