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

Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/libxml2/files: libxml2-2.7.3-printf-rename.patch libxml2-2.7.2-CVE-2008-422x.patch libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch libxml2-2.7.2-old-sax-parser-behaviour-option.patch libxml2-2.7.2-xmlAddChildList-pointer.patch
Date: Mon, 27 Apr 2009 21:28:49
Message-Id: E1LyYNb-0002Rn-52@stork.gentoo.org
1 eva 09/04/27 21:28:47
2
3 Added: libxml2-2.7.3-printf-rename.patch
4 Removed: libxml2-2.7.2-CVE-2008-422x.patch
5 libxml2-2.7.2-xmlTextWriterFullEndElement-indent.patch
6 libxml2-2.7.2-old-sax-parser-behaviour-option.patch
7 libxml2-2.7.2-xmlAddChildList-pointer.patch
8 Log:
9 Fix macro conflict with wxGTK, bug #266653. Clean up old revisions.
10 (Portage version: 2.2_rc31/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.1 dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/files/libxml2-2.7.3-printf-rename.patch?rev=1.1&content-type=text/plain
17
18 Index: libxml2-2.7.3-printf-rename.patch
19 ===================================================================
20 Author: Jose Luis Rivero <yoswink@g.o>
21 Source: patch extrated from libxml2 svn. Diff between 3826 .. 3827
22
23 Description: the patch fix the problems between libxml2 and wxGTK
24 described in http://mail.gnome.org/archives/xml/2009-April/msg00021.html.
25 It is basically a renaming of the macro function to avoid collisions
26 with other libraries.
27
28 This patch should only be applied to version 2.7.3
29
30 Index: include/libxml/parser.h
31 ===================================================================
32 --- include/libxml/parser.h (rev: 3826)
33 +++ include/libxml/parser.h (working copy)
34 @@ -594,7 +594,7 @@
35 * Display and format a warning messages, callback.
36 */
37 typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
38 - const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
39 + const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
40 /**
41 * errorSAXFunc:
42 * @ctx: an XML parser context
43 @@ -604,7 +604,7 @@
44 * Display and format an error messages, callback.
45 */
46 typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
47 - const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
48 + const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
49 /**
50 * fatalErrorSAXFunc:
51 * @ctx: an XML parser context
52 @@ -616,7 +616,7 @@
53 * get all the callbacks for errors.
54 */
55 typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
56 - const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
57 + const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
58 /**
59 * isStandaloneSAXFunc:
60 * @ctx: the user data (XML parser context)
61 Index: include/libxml/xmlwriter.h
62 ===================================================================
63 --- include/libxml/xmlwriter.h (rev: 3826)
64 +++ include/libxml/xmlwriter.h (working copy)
65 @@ -70,12 +70,12 @@
66 XMLPUBFUN int XMLCALL
67 xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer,
68 const char *format, ...)
69 - ATTRIBUTE_PRINTF(2,3);
70 + LIBXML_ATTR_FORMAT(2,3);
71 XMLPUBFUN int XMLCALL
72 xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer,
73 const char *format,
74 va_list argptr)
75 - ATTRIBUTE_PRINTF(2,0);
76 + LIBXML_ATTR_FORMAT(2,0);
77 XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr
78 writer,
79 const xmlChar *
80 @@ -105,13 +105,13 @@
81 xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer,
82 const xmlChar * namme,
83 const char *format, ...)
84 - ATTRIBUTE_PRINTF(3,4);
85 + LIBXML_ATTR_FORMAT(3,4);
86 XMLPUBFUN int XMLCALL
87 xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer,
88 const xmlChar * name,
89 const char *format,
90 va_list argptr)
91 - ATTRIBUTE_PRINTF(3,0);
92 + LIBXML_ATTR_FORMAT(3,0);
93 XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr
94 writer,
95 const xmlChar * name,
96 @@ -123,7 +123,7 @@
97 const xmlChar * name,
98 const xmlChar * namespaceURI,
99 const char *format, ...)
100 - ATTRIBUTE_PRINTF(5,6);
101 + LIBXML_ATTR_FORMAT(5,6);
102 XMLPUBFUN int XMLCALL
103 xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer,
104 const xmlChar * prefix,
105 @@ -131,7 +131,7 @@
106 const xmlChar * namespaceURI,
107 const char *format,
108 va_list argptr)
109 - ATTRIBUTE_PRINTF(5,0);
110 + LIBXML_ATTR_FORMAT(5,0);
111 XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr
112 writer,
113 const xmlChar *
114 @@ -148,11 +148,11 @@
115 XMLPUBFUN int XMLCALL
116 xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer,
117 const char *format, ...)
118 - ATTRIBUTE_PRINTF(2,3);
119 + LIBXML_ATTR_FORMAT(2,3);
120 XMLPUBFUN int XMLCALL
121 xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer,
122 const char *format, va_list argptr)
123 - ATTRIBUTE_PRINTF(2,0);
124 + LIBXML_ATTR_FORMAT(2,0);
125 XMLPUBFUN int XMLCALL
126 xmlTextWriterWriteRawLen(xmlTextWriterPtr writer,
127 const xmlChar * content, int len);
128 @@ -163,13 +163,13 @@
129 writer,
130 const char
131 *format, ...)
132 - ATTRIBUTE_PRINTF(2,3);
133 + LIBXML_ATTR_FORMAT(2,3);
134 XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr
135 writer,
136 const char
137 *format,
138 va_list argptr)
139 - ATTRIBUTE_PRINTF(2,0);
140 + LIBXML_ATTR_FORMAT(2,0);
141 XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer,
142 const xmlChar *
143 content);
144 @@ -204,13 +204,13 @@
145 xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer,
146 const xmlChar * name,
147 const char *format, ...)
148 - ATTRIBUTE_PRINTF(3,4);
149 + LIBXML_ATTR_FORMAT(3,4);
150 XMLPUBFUN int XMLCALL
151 xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer,
152 const xmlChar * name,
153 const char *format,
154 va_list argptr)
155 - ATTRIBUTE_PRINTF(3,0);
156 + LIBXML_ATTR_FORMAT(3,0);
157 XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr
158 writer,
159 const xmlChar * name,
160 @@ -222,7 +222,7 @@
161 const xmlChar * name,
162 const xmlChar * namespaceURI,
163 const char *format, ...)
164 - ATTRIBUTE_PRINTF(5,6);
165 + LIBXML_ATTR_FORMAT(5,6);
166 XMLPUBFUN int XMLCALL
167 xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer,
168 const xmlChar * prefix,
169 @@ -230,7 +230,7 @@
170 const xmlChar * namespaceURI,
171 const char *format,
172 va_list argptr)
173 - ATTRIBUTE_PRINTF(5,0);
174 + LIBXML_ATTR_FORMAT(5,0);
175 XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr
176 writer,
177 const xmlChar *
178 @@ -257,12 +257,12 @@
179 xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer,
180 const xmlChar * target,
181 const char *format, ...)
182 - ATTRIBUTE_PRINTF(3,4);
183 + LIBXML_ATTR_FORMAT(3,4);
184 XMLPUBFUN int XMLCALL
185 xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer,
186 const xmlChar * target,
187 const char *format, va_list argptr)
188 - ATTRIBUTE_PRINTF(3,0);
189 + LIBXML_ATTR_FORMAT(3,0);
190 XMLPUBFUN int XMLCALL
191 xmlTextWriterWritePI(xmlTextWriterPtr writer,
192 const xmlChar * target,
193 @@ -287,11 +287,11 @@
194 XMLPUBFUN int XMLCALL
195 xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer,
196 const char *format, ...)
197 - ATTRIBUTE_PRINTF(2,3);
198 + LIBXML_ATTR_FORMAT(2,3);
199 XMLPUBFUN int XMLCALL
200 xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer,
201 const char *format, va_list argptr)
202 - ATTRIBUTE_PRINTF(2,0);
203 + LIBXML_ATTR_FORMAT(2,0);
204 XMLPUBFUN int XMLCALL
205 xmlTextWriterWriteCDATA(xmlTextWriterPtr writer,
206 const xmlChar * content);
207 @@ -315,14 +315,14 @@
208 const xmlChar * pubid,
209 const xmlChar * sysid,
210 const char *format, ...)
211 - ATTRIBUTE_PRINTF(5,6);
212 + LIBXML_ATTR_FORMAT(5,6);
213 XMLPUBFUN int XMLCALL
214 xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer,
215 const xmlChar * name,
216 const xmlChar * pubid,
217 const xmlChar * sysid,
218 const char *format, va_list argptr)
219 - ATTRIBUTE_PRINTF(5,0);
220 + LIBXML_ATTR_FORMAT(5,0);
221 XMLPUBFUN int XMLCALL
222 xmlTextWriterWriteDTD(xmlTextWriterPtr writer,
223 const xmlChar * name,
224 @@ -353,13 +353,13 @@
225 xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer,
226 const xmlChar * name,
227 const char *format, ...)
228 - ATTRIBUTE_PRINTF(3,4);
229 + LIBXML_ATTR_FORMAT(3,4);
230 XMLPUBFUN int XMLCALL
231 xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer,
232 const xmlChar * name,
233 const char *format,
234 va_list argptr)
235 - ATTRIBUTE_PRINTF(3,0);
236 + LIBXML_ATTR_FORMAT(3,0);
237 XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr
238 writer,
239 const xmlChar *
240 @@ -383,13 +383,13 @@
241 xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer,
242 const xmlChar * name,
243 const char *format, ...)
244 - ATTRIBUTE_PRINTF(3,4);
245 + LIBXML_ATTR_FORMAT(3,4);
246 XMLPUBFUN int XMLCALL
247 xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer,
248 const xmlChar * name,
249 const char *format,
250 va_list argptr)
251 - ATTRIBUTE_PRINTF(3,0);
252 + LIBXML_ATTR_FORMAT(3,0);
253 XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr
254 writer,
255 const xmlChar *
256 @@ -414,14 +414,14 @@
257 int pe,
258 const xmlChar * name,
259 const char *format, ...)
260 - ATTRIBUTE_PRINTF(4,5);
261 + LIBXML_ATTR_FORMAT(4,5);
262 XMLPUBFUN int XMLCALL
263 xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer,
264 int pe,
265 const xmlChar * name,
266 const char *format,
267 va_list argptr)
268 - ATTRIBUTE_PRINTF(4,0);
269 + LIBXML_ATTR_FORMAT(4,0);
270 XMLPUBFUN int XMLCALL
271 xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer,
272 int pe,
273 Index: include/libxml/relaxng.h
274 ===================================================================
275 --- include/libxml/relaxng.h (rev: 3826)
276 +++ include/libxml/relaxng.h (working copy)
277 @@ -32,7 +32,7 @@
278 *
279 * Signature of an error callback from a Relax-NG validation
280 */
281 -typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
282 +typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
283
284 /**
285 * xmlRelaxNGValidityWarningFunc:
286 @@ -42,7 +42,7 @@
287 *
288 * Signature of a warning callback from a Relax-NG validation
289 */
290 -typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
291 +typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
292
293 /**
294 * A schemas validation context
295 Index: include/libxml/xmlversion.h.in
296 ===================================================================
297 --- include/libxml/xmlversion.h.in (rev: 3826)
298 +++ include/libxml/xmlversion.h.in (working copy)
299 @@ -414,19 +414,19 @@
300 #endif
301
302 /**
303 - * ATTRIBUTE_PRINTF:
304 + * LIBXML_ATTR_FORMAT:
305 *
306 * Macro used to indicate to GCC the parameter are printf like
307 */
308
309 -#ifndef ATTRIBUTE_PRINTF
310 +#ifndef LIBXML_ATTR_FORMAT
311 # if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
312 -# define ATTRIBUTE_PRINTF(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
313 +# define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
314 # else
315 -# define ATTRIBUTE_PRINTF(fmt,args)
316 +# define LIBXML_ATTR_FORMAT(fmt,args)
317 # endif
318 #else
319 -# define ATTRIBUTE_PRINTF(fmt,args)
320 +# define LIBXML_ATTR_FORMAT(fmt,args)
321 #endif
322
323 #else /* ! __GNUC__ */
324 @@ -443,11 +443,11 @@
325 */
326 #define ATTRIBUTE_ALLOC_SIZE(x)
327 /**
328 - * ATTRIBUTE_PRINTF:
329 + * LIBXML_ATTR_FORMAT:
330 *
331 * Macro used to indicate to GCC the parameter are printf like
332 */
333 -#define ATTRIBUTE_PRINTF(fmt,args)
334 +#define LIBXML_ATTR_FORMAT(fmt,args)
335 #endif /* __GNUC__ */
336
337 #ifdef __cplusplus
338
339 Index: include/libxml/valid.h
340 ===================================================================
341 --- include/libxml/valid.h (rev: 3826)
342 +++ include/libxml/valid.h (working copy)
343 @@ -41,7 +41,7 @@
344 */
345 typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
346 const char *msg,
347 - ...) ATTRIBUTE_PRINTF(2,3);
348 + ...) LIBXML_ATTR_FORMAT(2,3);
349
350 /**
351 * xmlValidityWarningFunc:
352 @@ -56,7 +56,7 @@
353 */
354 typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
355 const char *msg,
356 - ...) ATTRIBUTE_PRINTF(2,3);
357 + ...) LIBXML_ATTR_FORMAT(2,3);
358
359 #ifdef IN_LIBXML
360 /**
361 Index: include/libxml/xmlschemas.h
362 ===================================================================
363 --- include/libxml/xmlschemas.h (rev: 3826)
364 +++ include/libxml/xmlschemas.h (working copy)
365 @@ -92,7 +92,7 @@
366 *
367 * Signature of an error callback from an XSD validation
368 */
369 -typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
370 +typedef void (XMLCDECL *xmlSchemaValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
371
372 /**
373 * xmlSchemaValidityWarningFunc:
374 @@ -102,7 +102,7 @@
375 *
376 * Signature of a warning callback from an XSD validation
377 */
378 -typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) ATTRIBUTE_PRINTF(2,3);
379 +typedef void (XMLCDECL *xmlSchemaValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
380
381 /**
382 * A schemas validation context
383 Index: include/libxml/xmlerror.h
384 ===================================================================
385 --- include/libxml/xmlerror.h (rev: 3826)
386 +++ include/libxml/xmlerror.h (working copy)
387 @@ -843,7 +843,7 @@
388 */
389 typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
390 const char *msg,
391 - ...) ATTRIBUTE_PRINTF(2,3);
392 + ...) LIBXML_ATTR_FORMAT(2,3);
393 /**
394 * xmlStructuredErrorFunc:
395 * @userData: user provided data for the error callback
396 @@ -874,19 +874,19 @@
397 XMLPUBFUN void XMLCDECL
398 xmlParserError (void *ctx,
399 const char *msg,
400 - ...) ATTRIBUTE_PRINTF(2,3);
401 + ...) LIBXML_ATTR_FORMAT(2,3);
402 XMLPUBFUN void XMLCDECL
403 xmlParserWarning (void *ctx,
404 const char *msg,
405 - ...) ATTRIBUTE_PRINTF(2,3);
406 + ...) LIBXML_ATTR_FORMAT(2,3);
407 XMLPUBFUN void XMLCDECL
408 xmlParserValidityError (void *ctx,
409 const char *msg,
410 - ...) ATTRIBUTE_PRINTF(2,3);
411 + ...) LIBXML_ATTR_FORMAT(2,3);
412 XMLPUBFUN void XMLCDECL
413 xmlParserValidityWarning (void *ctx,
414 const char *msg,
415 - ...) ATTRIBUTE_PRINTF(2,3);
416 + ...) LIBXML_ATTR_FORMAT(2,3);
417 XMLPUBFUN void XMLCALL
418 xmlParserPrintFileInfo (xmlParserInputPtr input);
419 XMLPUBFUN void XMLCALL
420 @@ -930,7 +930,7 @@
421 int int1,
422 int col,
423 const char *msg,
424 - ...) ATTRIBUTE_PRINTF(16,17);
425 + ...) LIBXML_ATTR_FORMAT(16,17);
426 XMLPUBFUN void XMLCALL
427 __xmlSimpleError (int domain,
428 int code,
Report Message
Find on MARC Find on Google Groups