* [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files/2.2.1: gentoo-2.2.1-r1.diff itiff.diff ucb-no-CURL_NO_OLDIES.diff
@ 2007-09-21 7:54 Andreas Proschofsky (suka)
0 siblings, 0 replies; only message in thread
From: Andreas Proschofsky (suka) @ 2007-09-21 7:54 UTC (permalink / raw
To: gentoo-commits
suka 07/09/21 07:54:57
Added: gentoo-2.2.1-r1.diff itiff.diff
ucb-no-CURL_NO_OLDIES.diff
Log:
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)
Revision Changes Path
1.1 app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff?rev=1.1&content-type=text/plain
Index: gentoo-2.2.1-r1.diff
===================================================================
--- 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
1.1 app-office/openoffice/files/2.2.1/itiff.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/itiff.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/itiff.diff?rev=1.1&content-type=text/plain
Index: itiff.diff
===================================================================
--- 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;
}
1.1 app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff?rev=1.1&content-type=text/plain
Index: ucb-no-CURL_NO_OLDIES.diff
===================================================================
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 -----------------------------------------------------
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-09-21 10:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-21 7:54 [gentoo-commits] gentoo-x86 commit in app-office/openoffice/files/2.2.1: gentoo-2.2.1-r1.diff itiff.diff ucb-no-CURL_NO_OLDIES.diff Andreas Proschofsky (suka)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox