Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [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
Date: Fri, 21 Sep 2007 10:26:42
Message-Id: E1IYdLl-0004gw-Jj@stork.gentoo.org
1 suka 07/09/21 07:54:57
2
3 Added: gentoo-2.2.1-r1.diff itiff.diff
4 ucb-no-CURL_NO_OLDIES.diff
5 Log:
6 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
7 (Portage version: 2.1.3.9)
8
9 Revision Changes Path
10 1.1 app-office/openoffice/files/2.2.1/gentoo-2.2.1-r1.diff
11
12 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
13 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
14
15 Index: gentoo-2.2.1-r1.diff
16 ===================================================================
17 --- bin/package-ooo
18 +++ bin/package-ooo
19 @@ -57,6 +57,7 @@
20 #!/bin/sh
21 export OOO_EXTRA_ARG='$2'
22 +unset PYTHONPATH
23 $OOINSTBASE/program/ooqstart $3 "\$@"
24 EOT
25 chmod 755 $1
26 }
27 --- patches/src680/apply
28 +++ patches/src680/apply
29 @@ -904,6 +904,13 @@
30
31 # JavaUNOHelperServices.class must be built before juh.jar is created
32 javaunohelper-deps.diff, i#77465, pmladek
33 +
34 +# don't define -DCURL_NO_OLDIES, breaks with curl 7.17.0
35 +# Debian #442338, Debian #442368
36 +ucb-no-CURL_NO_OLDIES.diff
37 +
38 +# security fix
39 +itiff.diff
40
41 [ MandrivaOnly ]
42 SectionOwner => gghibo
43 @@ -1185,6 +1185,8 @@
44 system-db-check.diff, i#65979, hmth
45 # User ~/.ooo-2.0 as user dir
46 scp2-user-config-ooo-2.0.diff, pmladek
47 +# Fix visbility issue with gcc-4.2
48 +swregion-gcc42.diff, i#78417, aprosky
49
50 [ DebianBaseOnly ]
51 SectionOwner => rengelha
52
53
54
55
56 1.1 app-office/openoffice/files/2.2.1/itiff.diff
57
58 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/files/2.2.1/itiff.diff?rev=1.1&view=markup
59 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
60
61 Index: itiff.diff
62 ===================================================================
63 --- goodies/source/filter.vcl/itiff/itiff.cxx-old 2007-06-21 14:17:54.000000000 +0100
64 +++ goodies/source/filter.vcl/itiff/itiff.cxx 2007-06-21 14:18:01.000000000 +0100
65 @@ -154,7 +154,7 @@
66 double ReadDoubleData();
67
68 void ReadHeader();
69 - void ReadTagData( USHORT nTagType, ULONG nDataLen );
70 + void ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
71
72 BOOL ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
73 // Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
74 @@ -310,7 +310,7 @@
75
76 // ---------------------------------------------------------------------------------
77
78 -void TIFFReader::ReadTagData( USHORT nTagType, ULONG nDataLen)
79 +void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
80 {
81 if ( bStatus == FALSE )
82 return;
83 @@ -373,16 +373,25 @@
84 case 0x0111: { // Strip Offset(s)
85 ULONG nOldNumSO, i, * pOldSO;
86 pOldSO = pStripOffsets;
87 - if ( pOldSO == NULL ) nNumStripOffsets = 0; // Sicherheitshalber
88 + if ( pOldSO == NULL )
89 + nNumStripOffsets = 0;
90 nOldNumSO = nNumStripOffsets;
91 - nNumStripOffsets += nDataLen;
92 - pStripOffsets = new ULONG[ nNumStripOffsets ];
93 - for ( i = 0; i < nOldNumSO; i++ )
94 - pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
95 - for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
96 - pStripOffsets[ i ] = ReadIntData() + nOrigPos;
97 - if ( pOldSO != NULL )
98 + nDataLen += nOldNumSO;
99 + if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
100 + {
101 + nNumStripOffsets = nDataLen;
102 + pStripOffsets = new ULONG[ nNumStripOffsets ];
103 + if ( !pStripOffsets )
104 + nNumStripOffsets = 0;
105 + else
106 + {
107 + for ( i = 0; i < nOldNumSO; i++ )
108 + pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
109 + for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
110 + pStripOffsets[ i ] = ReadIntData() + nOrigPos;
111 + }
112 delete[] pOldSO;
113 + }
114 OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
115 break;
116 }
117 @@ -404,16 +413,25 @@
118 case 0x0117: { // Strip Byte Counts
119 ULONG nOldNumSBC, i, * pOldSBC;
120 pOldSBC = pStripByteCounts;
121 - if ( pOldSBC == NULL ) nNumStripByteCounts = 0; // Sicherheitshalber
122 + if ( pOldSBC == NULL )
123 + nNumStripByteCounts = 0; // Sicherheitshalber
124 nOldNumSBC = nNumStripByteCounts;
125 - nNumStripByteCounts += nDataLen;
126 - pStripByteCounts = new ULONG[ nNumStripByteCounts ];
127 - for ( i = 0; i < nOldNumSBC; i++ )
128 - pStripByteCounts[ i ] = pOldSBC[ i ];
129 - for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
130 - pStripByteCounts[ i ] = ReadIntData();
131 - if ( pOldSBC != NULL )
132 + nDataLen += nOldNumSBC;
133 + if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
134 + {
135 + nNumStripByteCounts = nDataLen;
136 + pStripByteCounts = new ULONG[ nNumStripByteCounts ];
137 + if ( !nNumStripByteCounts )
138 + nNumStripByteCounts = 0;
139 + else
140 + {
141 + for ( i = 0; i < nOldNumSBC; i++ )
142 + pStripByteCounts[ i ] = pOldSBC[ i ];
143 + for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
144 + pStripByteCounts[ i ] = ReadIntData();
145 + }
146 delete[] pOldSBC;
147 + }
148 OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
149 break;
150 }
151
152
153
154 1.1 app-office/openoffice/files/2.2.1/ucb-no-CURL_NO_OLDIES.diff
155
156 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
157 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
158
159 Index: ucb-no-CURL_NO_OLDIES.diff
160 ===================================================================
161 Index: source/ucp/ftp/makefile.mk
162 ===================================================================
163 RCS file: /cvs/ucb/ucb/source/ucp/ftp/makefile.mk,v
164 retrieving revision 1.13
165 retrieving revision 1.12
166 diff -u -u -r1.13 -r1.12
167 --- ucb/source/ucp/ftp/makefile.mk 20 Sep 2004 14:32:42 -0000 1.13
168 +++ ucb/source/ucp/ftp/makefile.mk 2 Feb 2004 18:36:22 -0000 1.12
169 @@ -75,9 +75,7 @@
170
171 .INCLUDE: settings.mk
172
173 -.IF "$(SYSTEM_CURL)" == "YES"
174 -CFLAGS+=-DCURL_NO_OLDIES
175 -.ENDIF
176 +#CFLAGS +=-fno-inline
177
178 # --- General -----------------------------------------------------
179
180
181
182
183 --
184 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups