summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch1184
-rw-r--r--meta/recipes-support/libsoup/libsoup_2.2.105.bb (renamed from meta/recipes-support/libsoup/libsoup_2.2.100.bb)9
2 files changed, 1189 insertions, 4 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
new file mode 100644
index 0000000000..ad13bbde47
--- /dev/null
+++ b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
@@ -0,0 +1,1184 @@
1diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c
2--- libsoup-2.2.105/tests/auth-test.c 2007-12-05 00:13:27.000000000 +0200
3+++ libsoup-2.2.105.new//tests/auth-test.c 2012-01-16 20:12:09.000000000 +0200
4@@ -19,7 +19,7 @@ int errors = 0;
5 gboolean debug = FALSE;
6
7 static void
8-dprintf (const char *format, ...)
9+dprintfsoup (const char *format, ...)
10 {
11 va_list args;
12
13@@ -216,18 +216,18 @@ handler (SoupMessage *msg, gpointer data
14
15 auth = identify_auth (msg);
16
17- dprintf (" %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
18+ dprintfsoup (" %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
19 auths[auth]);
20
21 if (*expected) {
22 exp = *expected - '0';
23 if (auth != exp) {
24- dprintf (" expected %s!\n", auths[exp]);
25+ dprintfsoup (" expected %s!\n", auths[exp]);
26 errors++;
27 }
28 memmove (expected, expected + 1, strlen (expected));
29 } else {
30- dprintf (" expected to be finished\n");
31+ dprintfsoup (" expected to be finished\n");
32 errors++;
33 }
34 }
35@@ -266,10 +266,10 @@ bug271540_sent (SoupMessage *msg, gpoint
36 int auth = identify_auth (msg);
37
38 if (!*authenticated && auth) {
39- dprintf (" using auth on message %d before authenticating!!??\n", n);
40+ dprintfsoup (" using auth on message %d before authenticating!!??\n", n);
41 errors++;
42 } else if (*authenticated && !auth) {
43- dprintf (" sent unauthenticated message %d after authenticating!\n", n);
44+ dprintfsoup (" sent unauthenticated message %d after authenticating!\n", n);
45 errors++;
46 }
47 }
48@@ -287,12 +287,12 @@ bug271540_authenticate (SoupSession *ses
49 return;
50
51 if (!*authenticated) {
52- dprintf (" authenticating message %d\n", n);
53+ dprintfsoup (" authenticating message %d\n", n);
54 *username = g_strdup ("user1");
55 *password = g_strdup ("realm1");
56 *authenticated = TRUE;
57 } else {
58- dprintf (" asked to authenticate message %d after authenticating!\n", n);
59+ dprintfsoup (" asked to authenticate message %d after authenticating!\n", n);
60 errors++;
61 }
62 }
63@@ -304,7 +304,7 @@ bug271540_finished (SoupMessage *msg, gp
64 int n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (msg), "#"));
65
66 if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
67- dprintf (" got status '%d %s' on message %d!\n",
68+ dprintfsoup (" got status '%d %s' on message %d!\n",
69 msg->status_code, msg->reason_phrase, n);
70 errors++;
71 }
72@@ -350,10 +350,10 @@ main (int argc, char **argv)
73 G_CALLBACK (reauthenticate), &i);
74
75 for (i = 0; i < ntests; i++) {
76- dprintf ("Test %d: %s\n", i + 1, tests[i].explanation);
77+ dprintfsoup ("Test %d: %s\n", i + 1, tests[i].explanation);
78
79 uri = g_strconcat (base_uri, tests[i].url, NULL);
80- dprintf (" GET %s\n", uri);
81+ dprintfsoup (" GET %s\n", uri);
82
83 msg = soup_message_new (SOUP_METHOD_GET, uri);
84 g_free (uri);
85@@ -372,21 +372,21 @@ main (int argc, char **argv)
86 soup_session_send_message (session, msg);
87 if (msg->status_code != SOUP_STATUS_UNAUTHORIZED &&
88 msg->status_code != SOUP_STATUS_OK) {
89- dprintf (" %d %s !\n", msg->status_code,
90+ dprintfsoup (" %d %s !\n", msg->status_code,
91 msg->reason_phrase);
92 errors++;
93 }
94 if (*expected) {
95- dprintf (" expected %d more round(s)\n",
96+ dprintfsoup (" expected %d more round(s)\n",
97 (int)strlen (expected));
98 errors++;
99 }
100 g_free (expected);
101
102 if (msg->status_code != tests[i].final_status)
103- dprintf (" expected %d\n", tests[i].final_status);
104+ dprintfsoup (" expected %d\n", tests[i].final_status);
105
106- dprintf ("\n");
107+ dprintfsoup ("\n");
108
109 g_object_unref (msg);
110 }
111@@ -395,7 +395,7 @@ main (int argc, char **argv)
112
113 /* And now for a regression test */
114
115- dprintf ("Regression test for bug 271540:\n");
116+ dprintfsoup ("Regression test for bug 271540:\n");
117 session = soup_session_async_new ();
118
119 authenticated = FALSE;
120@@ -424,7 +424,7 @@ main (int argc, char **argv)
121
122 apache_cleanup ();
123
124- dprintf ("\n");
125+ dprintfsoup ("\n");
126 if (errors) {
127 printf ("auth-test: %d error(s). Run with '-d' for details\n",
128 errors);
129diff -rupN libsoup-2.2.105/tests/context-test.c libsoup-2.2.105.new//tests/context-test.c
130--- libsoup-2.2.105/tests/context-test.c 2007-12-05 00:13:27.000000000 +0200
131+++ libsoup-2.2.105.new//tests/context-test.c 2012-01-16 20:11:27.000000000 +0200
132@@ -28,7 +28,7 @@ GThread *server_thread;
133 char *base_uri;
134
135 static void
136-dprintf (const char *format, ...)
137+dprintfsoup (const char *format, ...)
138 {
139 va_list args;
140
141@@ -168,7 +168,7 @@ do_test1 (void)
142 {
143 GMainLoop *loop;
144
145- dprintf ("Test 1: blocking the main thread does not block other thread\n");
146+ dprintfsoup ("Test 1: blocking the main thread does not block other thread\n");
147
148 test1_cond = g_cond_new ();
149 test1_mutex = g_mutex_new ();
150@@ -196,7 +196,7 @@ idle_start_test1_thread (gpointer loop)
151 if (g_cond_timed_wait (test1_cond, test1_mutex, &time))
152 g_thread_join (thread);
153 else {
154- dprintf (" timeout!\n");
155+ dprintfsoup (" timeout!\n");
156 errors++;
157 }
158
159@@ -232,17 +232,17 @@ test1_thread (gpointer user_data)
160
161 uri = g_build_filename (base_uri, "slow", NULL);
162
163- dprintf (" send_message\n");
164+ dprintfsoup (" send_message\n");
165 msg = soup_message_new ("GET", uri);
166 soup_session_send_message (session, msg);
167 if (msg->status_code != SOUP_STATUS_OK) {
168- dprintf (" unexpected status: %d %s\n",
169+ dprintfsoup (" unexpected status: %d %s\n",
170 msg->status_code, msg->reason_phrase);
171 errors++;
172 }
173 g_object_unref (msg);
174
175- dprintf (" queue_message\n");
176+ dprintfsoup (" queue_message\n");
177 msg = soup_message_new ("GET", uri);
178 loop = g_main_loop_new (async_context, FALSE);
179 g_object_ref (msg);
180@@ -250,7 +250,7 @@ test1_thread (gpointer user_data)
181 g_main_loop_run (loop);
182 g_main_loop_unref (loop);
183 if (msg->status_code != SOUP_STATUS_OK) {
184- dprintf (" unexpected status: %d %s\n",
185+ dprintfsoup (" unexpected status: %d %s\n",
186 msg->status_code, msg->reason_phrase);
187 errors++;
188 }
189@@ -279,7 +279,7 @@ do_test2 (void)
190 char *uri;
191 SoupMessage *msg;
192
193- dprintf ("Test 2: a session with its own context is independent of the main loop.\n");
194+ dprintfsoup ("Test 2: a session with its own context is independent of the main loop.\n");
195
196 idle = g_idle_add_full (G_PRIORITY_HIGH, idle_test2_fail, NULL, NULL);
197
198@@ -291,11 +291,11 @@ do_test2 (void)
199
200 uri = g_build_filename (base_uri, "slow", NULL);
201
202- dprintf (" send_message\n");
203+ dprintfsoup (" send_message\n");
204 msg = soup_message_new ("GET", uri);
205 soup_session_send_message (session, msg);
206 if (msg->status_code != SOUP_STATUS_OK) {
207- dprintf (" unexpected status: %d %s\n",
208+ dprintfsoup (" unexpected status: %d %s\n",
209 msg->status_code, msg->reason_phrase);
210 errors++;
211 }
212@@ -311,7 +311,7 @@ do_test2 (void)
213 static gboolean
214 idle_test2_fail (gpointer user_data)
215 {
216- dprintf (" idle ran!\n");
217+ dprintfsoup (" idle ran!\n");
218 errors++;
219 return FALSE;
220 }
221@@ -356,7 +356,7 @@ main (int argc, char **argv)
222 g_free (base_uri);
223 g_main_context_unref (g_main_context_default ());
224
225- dprintf ("\n");
226+ dprintfsoup ("\n");
227 if (errors) {
228 printf ("context-test: %d error(s). Run with '-d' for details\n",
229 errors);
230diff -rupN libsoup-2.2.105/tests/header-parsing.c libsoup-2.2.105.new//tests/header-parsing.c
231--- libsoup-2.2.105/tests/header-parsing.c 2007-10-28 19:57:03.000000000 +0200
232+++ libsoup-2.2.105.new//tests/header-parsing.c 2012-01-16 20:11:54.000000000 +0200
233@@ -10,7 +10,7 @@
234 gboolean debug = FALSE;
235
236 static void
237-dprintf (const char *format, ...)
238+dprintfsoup (const char *format, ...)
239 {
240 va_list args;
241
242@@ -455,7 +455,7 @@ static void
243 print_header (gpointer key, gpointer value, gpointer data)
244 {
245 GSList *values = value;
246- dprintf (" '%s': '%s'\n",
247+ dprintfsoup (" '%s': '%s'\n",
248 (char *)key, (char*)values->data);
249 }
250
251@@ -480,11 +480,11 @@ do_request_tests (void)
252 SoupHttpVersion version;
253 GHashTable *headers;
254
255- dprintf ("Request tests\n");
256+ dprintfsoup ("Request tests\n");
257 for (i = 0; i < 1; i++) {
258 gboolean ok = TRUE;
259
260- dprintf ("%2d. %s (%s): ", i + 1, reqtests[i].description,
261+ dprintfsoup ("%2d. %s (%s): ", i + 1, reqtests[i].description,
262 reqtests[i].method ? "should parse" : "should NOT parse");
263
264 headers = g_hash_table_new_full (g_str_hash, g_str_equal,
265@@ -519,34 +519,34 @@ do_request_tests (void)
266 }
267
268 if (ok)
269- dprintf ("OK!\n");
270+ dprintfsoup ("OK!\n");
271 else {
272- dprintf ("BAD!\n");
273+ dprintfsoup ("BAD!\n");
274 errors++;
275 if (reqtests[i].method) {
276- dprintf (" expected: '%s' '%s' 'HTTP/1.%d'\n",
277+ dprintfsoup (" expected: '%s' '%s' 'HTTP/1.%d'\n",
278 reqtests[i].method, reqtests[i].path,
279 reqtests[i].version);
280 for (h = 0; reqtests[i].headers[h].name; h++) {
281- dprintf (" '%s': '%s'\n",
282+ dprintfsoup (" '%s': '%s'\n",
283 reqtests[i].headers[h].name,
284 reqtests[i].headers[h].value);
285 }
286 } else
287- dprintf (" expected: parse error\n");
288+ dprintfsoup (" expected: parse error\n");
289 if (method) {
290- dprintf (" got: '%s' '%s' 'HTTP/1.%d'\n",
291+ dprintfsoup (" got: '%s' '%s' 'HTTP/1.%d'\n",
292 method, path, version);
293 g_hash_table_foreach (headers, print_header, NULL);
294 } else
295- dprintf (" got: parse error\n");
296+ dprintfsoup (" got: parse error\n");
297 }
298
299 g_free (method);
300 g_free (path);
301 g_hash_table_destroy (headers);
302 }
303- dprintf ("\n");
304+ dprintfsoup ("\n");
305
306 return errors;
307 }
308@@ -561,11 +561,11 @@ do_response_tests (void)
309 SoupHttpVersion version;
310 GHashTable *headers;
311
312- dprintf ("Response tests\n");
313+ dprintfsoup ("Response tests\n");
314 for (i = 0; i < num_resptests; i++) {
315 gboolean ok = TRUE;
316
317- dprintf ("%2d. %s (%s): ", i + 1, resptests[i].description,
318+ dprintfsoup ("%2d. %s (%s): ", i + 1, resptests[i].description,
319 resptests[i].reason_phrase ? "should parse" : "should NOT parse");
320
321 headers = g_hash_table_new_full (g_str_hash, g_str_equal,
322@@ -600,34 +600,34 @@ do_response_tests (void)
323 }
324
325 if (ok)
326- dprintf ("OK!\n");
327+ dprintfsoup ("OK!\n");
328 else {
329- dprintf ("BAD!\n");
330+ dprintfsoup ("BAD!\n");
331 errors++;
332 if (resptests[i].reason_phrase) {
333- dprintf (" expected: 'HTTP/1.%d' '%03d' '%s'\n",
334+ dprintfsoup (" expected: 'HTTP/1.%d' '%03d' '%s'\n",
335 resptests[i].version,
336 resptests[i].status_code,
337 resptests[i].reason_phrase);
338 for (h = 0; resptests[i].headers[h].name; h++) {
339- dprintf (" '%s': '%s'\n",
340+ dprintfsoup (" '%s': '%s'\n",
341 resptests[i].headers[h].name,
342 resptests[i].headers[h].value);
343 }
344 } else
345- dprintf (" expected: parse error\n");
346+ dprintfsoup (" expected: parse error\n");
347 if (reason_phrase) {
348- dprintf (" got: 'HTTP/1.%d' '%03d' '%s'\n",
349+ dprintfsoup (" got: 'HTTP/1.%d' '%03d' '%s'\n",
350 version, status_code, reason_phrase);
351 g_hash_table_foreach (headers, print_header, NULL);
352 } else
353- dprintf (" got: parse error\n");
354+ dprintfsoup (" got: parse error\n");
355 }
356
357 g_free (reason_phrase);
358 g_hash_table_destroy (headers);
359 }
360- dprintf ("\n");
361+ dprintfsoup ("\n");
362
363 return errors;
364 }
365@@ -651,7 +651,7 @@ main (int argc, char **argv)
366 errors = do_request_tests ();
367 errors += do_response_tests ();
368
369- dprintf ("\n");
370+ dprintfsoup ("\n");
371 if (errors) {
372 printf ("header-parsing: %d error(s). Run with '-d' for details\n",
373 errors);
374diff -rupN libsoup-2.2.105/tests/ntlm-test.c libsoup-2.2.105.new//tests/ntlm-test.c
375--- libsoup-2.2.105/tests/ntlm-test.c 2007-12-05 00:13:27.000000000 +0200
376+++ libsoup-2.2.105.new//tests/ntlm-test.c 2012-01-16 20:11:45.000000000 +0200
377@@ -29,7 +29,7 @@
378 gboolean debug = FALSE;
379
380 static void
381-dprintf (const char *format, ...)
382+dprintfsoup (const char *format, ...)
383 {
384 va_list args;
385
386@@ -219,58 +219,58 @@ do_message (SoupSession *session, SoupUr
387 G_CALLBACK (ntlm_response_check), &state);
388
389 soup_session_send_message (session, msg);
390- dprintf (" %-10s -> ", path);
391+ dprintfsoup (" %-10s -> ", path);
392
393 if (state.got_prompt) {
394- dprintf (" PROMPT");
395+ dprintfsoup (" PROMPT");
396 if (!get_prompt) {
397- dprintf ("???");
398+ dprintfsoup ("???");
399 errors++;
400 }
401 } else if (get_prompt) {
402- dprintf (" no-prompt???");
403+ dprintfsoup (" no-prompt???");
404 errors++;
405 }
406
407 if (state.sent_request) {
408- dprintf (" REQUEST");
409+ dprintfsoup (" REQUEST");
410 if (!do_ntlm) {
411- dprintf ("???");
412+ dprintfsoup ("???");
413 errors++;
414 }
415 } else if (do_ntlm) {
416- dprintf (" no-request???");
417+ dprintfsoup (" no-request???");
418 errors++;
419 }
420
421 if (state.got_challenge) {
422- dprintf (" CHALLENGE");
423+ dprintfsoup (" CHALLENGE");
424 if (!do_ntlm) {
425- dprintf ("???");
426+ dprintfsoup ("???");
427 errors++;
428 }
429 } else if (do_ntlm) {
430- dprintf (" no-challenge???");
431+ dprintfsoup (" no-challenge???");
432 errors++;
433 }
434
435 if (state.sent_response) {
436- dprintf (" RESPONSE");
437+ dprintfsoup (" RESPONSE");
438 if (!do_ntlm) {
439- dprintf ("???");
440+ dprintfsoup ("???");
441 errors++;
442 }
443 } else if (do_ntlm) {
444- dprintf (" no-response???");
445+ dprintfsoup (" no-response???");
446 errors++;
447 }
448
449- dprintf (" -> %s", msg->reason_phrase);
450+ dprintfsoup (" -> %s", msg->reason_phrase);
451 if (msg->status_code != status_code) {
452- dprintf ("???");
453+ dprintfsoup ("???");
454 errors++;
455 }
456- dprintf ("\n");
457+ dprintfsoup ("\n");
458
459 g_object_unref (msg);
460 return errors;
461@@ -327,11 +327,11 @@ do_ntlm_tests (SoupUri *base_uri)
462 {
463 int errors = 0;
464
465- dprintf ("Round 1: Non-NTLM Connection\n");
466+ dprintfsoup ("Round 1: Non-NTLM Connection\n");
467 errors += do_ntlm_round (base_uri, NULL);
468- dprintf ("Round 2: NTLM Connection, user=alice\n");
469+ dprintfsoup ("Round 2: NTLM Connection, user=alice\n");
470 errors += do_ntlm_round (base_uri, "alice");
471- dprintf ("Round 3: NTLM Connection, user=bob\n");
472+ dprintfsoup ("Round 3: NTLM Connection, user=bob\n");
473 errors += do_ntlm_round (base_uri, "bob");
474
475 return errors;
476@@ -397,7 +397,7 @@ main (int argc, char **argv)
477 g_hash_table_destroy (connections);
478 g_main_context_unref (g_main_context_default ());
479
480- dprintf ("\n");
481+ dprintfsoup ("\n");
482 if (errors) {
483 printf ("ntlm-test: %d error(s). Run with '-d' for details\n",
484 errors);
485diff -rupN libsoup-2.2.105/tests/proxy-test.c libsoup-2.2.105.new//tests/proxy-test.c
486--- libsoup-2.2.105/tests/proxy-test.c 2007-12-05 00:13:27.000000000 +0200
487+++ libsoup-2.2.105.new//tests/proxy-test.c 2012-01-16 20:11:02.000000000 +0200
488@@ -14,7 +14,7 @@ int errors = 0;
489 gboolean debug = FALSE;
490
491 static void
492-dprintf (const char *format, ...)
493+dprintfsoup (const char *format, ...)
494 {
495 va_list args;
496
497@@ -76,7 +76,7 @@ test_url (const char *url, int proxy, gu
498 SoupUri *proxy_uri;
499 SoupMessage *msg;
500
501- dprintf (" GET %s via %s\n", url, proxy_names[proxy]);
502+ dprintfsoup (" GET %s via %s\n", url, proxy_names[proxy]);
503 if (proxy == UNAUTH_PROXY && expected != SOUP_STATUS_FORBIDDEN)
504 expected = SOUP_STATUS_PROXY_UNAUTHORIZED;
505
506@@ -99,9 +99,9 @@ test_url (const char *url, int proxy, gu
507
508 soup_session_send_message (session, msg);
509
510- dprintf (" %d %s\n", msg->status_code, msg->reason_phrase);
511+ dprintfsoup (" %d %s\n", msg->status_code, msg->reason_phrase);
512 if (msg->status_code != expected) {
513- dprintf (" EXPECTED %d!\n", expected);
514+ dprintfsoup (" EXPECTED %d!\n", expected);
515 errors++;
516 }
517
518@@ -115,7 +115,7 @@ run_test (int i, gboolean sync)
519 {
520 char *http_url, *https_url;
521
522- dprintf ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
523+ dprintfsoup ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
524 sync ? "sync" : "async");
525
526 if (!strncmp (tests[i].url, "http", 4)) {
527@@ -141,7 +141,7 @@ run_test (int i, gboolean sync)
528 g_free (http_url);
529 g_free (https_url);
530
531- dprintf ("\n");
532+ dprintfsoup ("\n");
533 }
534
535 int
536@@ -176,7 +176,7 @@ main (int argc, char **argv)
537 apache_cleanup ();
538 g_main_context_unref (g_main_context_default ());
539
540- dprintf ("\n");
541+ dprintfsoup ("\n");
542 if (errors) {
543 printf ("proxy-test: %d error(s). Run with '-d' for details\n",
544 errors);
545diff -rupN libsoup-2.2.105/tests/pull-api.c libsoup-2.2.105.new//tests/pull-api.c
546--- libsoup-2.2.105/tests/pull-api.c 2007-12-05 00:13:27.000000000 +0200
547+++ libsoup-2.2.105.new//tests/pull-api.c 2012-01-16 20:11:14.000000000 +0200
548@@ -19,7 +19,7 @@ char *correct_response;
549 guint correct_response_len;
550
551 static void
552-dprintf (int level, const char *format, ...)
553+dprintfsoup (int level, const char *format, ...)
554 {
555 va_list args;
556
557@@ -98,7 +98,7 @@ do_fully_async_test (SoupSession *sessio
558 loop = g_main_loop_new (NULL, FALSE);
559
560 uri = g_build_filename (base_uri, sub_uri, NULL);
561- dprintf (1, "GET %s\n", uri);
562+ dprintfsoup (1, "GET %s\n", uri);
563
564 msg = soup_message_new (SOUP_METHOD_GET, uri);
565 g_free (uri);
566@@ -152,10 +152,10 @@ fully_async_request_chunk (gpointer user
567 FullyAsyncData *ad = user_data;
568
569 if (!ad->did_first_timeout) {
570- dprintf (1, " first timeout\n");
571+ dprintfsoup (1, " first timeout\n");
572 ad->did_first_timeout = TRUE;
573 } else
574- dprintf (2, " timeout\n");
575+ dprintfsoup (2, " timeout\n");
576 ad->timeout = 0;
577
578 /* ad->chunks_ready and ad->chunk_wanted are used because
579@@ -180,14 +180,14 @@ fully_async_got_headers (SoupMessage *ms
580 {
581 FullyAsyncData *ad = user_data;
582
583- dprintf (1, " %d %s\n", msg->status_code, msg->reason_phrase);
584+ dprintfsoup (1, " %d %s\n", msg->status_code, msg->reason_phrase);
585 if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
586 /* Let soup handle this one; this got_headers handler
587 * will get called again next time around.
588 */
589 return;
590 } else if (msg->status_code != SOUP_STATUS_OK) {
591- dprintf (1, " unexpected status: %d %s\n",
592+ dprintfsoup (1, " unexpected status: %d %s\n",
593 msg->status_code, msg->reason_phrase);
594 errors++;
595 return;
596@@ -210,7 +210,7 @@ fully_async_got_chunk (SoupMessage *msg,
597 {
598 FullyAsyncData *ad = user_data;
599
600- dprintf (2, " got chunk from %lu - %lu\n",
601+ dprintfsoup (2, " got chunk from %lu - %lu\n",
602 (unsigned long) ad->read_so_far,
603 (unsigned long) ad->read_so_far + msg->response.length);
604
605@@ -227,13 +227,13 @@ fully_async_got_chunk (SoupMessage *msg,
606 * somewhere.
607 */
608 if (ad->read_so_far + msg->response.length > correct_response_len) {
609- dprintf (1, " read too far! (%lu > %lu)\n",
610+ dprintfsoup (1, " read too far! (%lu > %lu)\n",
611 (unsigned long) (ad->read_so_far + msg->response.length),
612 (unsigned long) correct_response_len);
613 errors++;
614 } else if (memcmp (msg->response.body, correct_response + ad->read_so_far,
615 msg->response.length) != 0) {
616- dprintf (1, " data mismatch in block starting at %lu\n",
617+ dprintfsoup (1, " data mismatch in block starting at %lu\n",
618 (unsigned long) ad->read_so_far);
619 errors++;
620 }
621@@ -257,7 +257,7 @@ fully_async_finished (SoupMessage *msg,
622 FullyAsyncData *ad = user_data;
623
624 if (msg->status_code != ad->expected_status) {
625- dprintf (1, " unexpected final status: %d %s !\n",
626+ dprintfsoup (1, " unexpected final status: %d %s !\n",
627 msg->status_code, msg->reason_phrase);
628 errors++;
629 }
630@@ -300,7 +300,7 @@ do_synchronously_async_test (SoupSession
631 GByteArray *chunk;
632
633 uri = g_build_filename (base_uri, sub_uri, NULL);
634- dprintf (1, "GET %s\n", uri);
635+ dprintfsoup (1, "GET %s\n", uri);
636
637 msg = soup_message_new (SOUP_METHOD_GET, uri);
638 g_free (uri);
639@@ -314,11 +314,11 @@ do_synchronously_async_test (SoupSession
640 sync_async_send (session, msg);
641 if (msg->status == SOUP_MESSAGE_STATUS_FINISHED &&
642 expected_status == SOUP_STATUS_OK) {
643- dprintf (1, " finished without reading response!\n");
644+ dprintfsoup (1, " finished without reading response!\n");
645 errors++;
646 } else if (msg->status != SOUP_MESSAGE_STATUS_FINISHED &&
647 expected_status != SOUP_STATUS_OK) {
648- dprintf (1, " request failed to fail!\n");
649+ dprintfsoup (1, " request failed to fail!\n");
650 errors++;
651 }
652
653@@ -327,19 +327,19 @@ do_synchronously_async_test (SoupSession
654 */
655 read_so_far = 0;
656 while ((chunk = sync_async_read_chunk (msg))) {
657- dprintf (2, " read chunk from %lu - %lu\n",
658+ dprintfsoup (2, " read chunk from %lu - %lu\n",
659 (unsigned long) read_so_far,
660 (unsigned long) read_so_far + chunk->len);
661
662 if (read_so_far + chunk->len > correct_response_len) {
663- dprintf (1, " read too far! (%lu > %lu)\n",
664+ dprintfsoup (1, " read too far! (%lu > %lu)\n",
665 (unsigned long) read_so_far + chunk->len,
666 (unsigned long) correct_response_len);
667 errors++;
668 } else if (memcmp (chunk->data,
669 correct_response + read_so_far,
670 chunk->len) != 0) {
671- dprintf (1, " data mismatch in block starting at %lu\n",
672+ dprintfsoup (1, " data mismatch in block starting at %lu\n",
673 (unsigned long) read_so_far);
674 errors++;
675 }
676@@ -350,10 +350,10 @@ do_synchronously_async_test (SoupSession
677 if (msg->status != SOUP_MESSAGE_STATUS_FINISHED ||
678 (msg->status_code == SOUP_STATUS_OK &&
679 read_so_far != correct_response_len)) {
680- dprintf (1, " loop ended before message was fully read!\n");
681+ dprintfsoup (1, " loop ended before message was fully read!\n");
682 errors++;
683 } else if (msg->status_code != expected_status) {
684- dprintf (1, " unexpected final status: %d %s !\n",
685+ dprintfsoup (1, " unexpected final status: %d %s !\n",
686 msg->status_code, msg->reason_phrase);
687 errors++;
688 }
689@@ -413,14 +413,14 @@ sync_async_got_headers (SoupMessage *msg
690 {
691 SyncAsyncData *ad = user_data;
692
693- dprintf (1, " %d %s\n", msg->status_code, msg->reason_phrase);
694+ dprintfsoup (1, " %d %s\n", msg->status_code, msg->reason_phrase);
695 if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
696 /* Let soup handle this one; this got_headers handler
697 * will get called again next time around.
698 */
699 return;
700 } else if (msg->status_code != SOUP_STATUS_OK) {
701- dprintf (1, " unexpected status: %d %s\n",
702+ dprintfsoup (1, " unexpected status: %d %s\n",
703 msg->status_code, msg->reason_phrase);
704 errors++;
705 return;
706@@ -526,7 +526,7 @@ main (int argc, char **argv)
707 base_uri = "http://localhost:47524/";
708 get_correct_response (base_uri);
709
710- dprintf (1, "\nFully async, fast requests\n");
711+ dprintfsoup (1, "\nFully async, fast requests\n");
712 session = soup_session_async_new ();
713 g_signal_connect (session, "authenticate",
714 G_CALLBACK (authenticate), NULL);
715@@ -539,7 +539,7 @@ main (int argc, char **argv)
716 soup_session_abort (session);
717 g_object_unref (session);
718
719- dprintf (1, "\nFully async, slow requests\n");
720+ dprintfsoup (1, "\nFully async, slow requests\n");
721 session = soup_session_async_new ();
722 g_signal_connect (session, "authenticate",
723 G_CALLBACK (authenticate), NULL);
724@@ -552,7 +552,7 @@ main (int argc, char **argv)
725 soup_session_abort (session);
726 g_object_unref (session);
727
728- dprintf (1, "\nSynchronously async\n");
729+ dprintfsoup (1, "\nSynchronously async\n");
730 session = soup_session_async_new ();
731 g_signal_connect (session, "authenticate",
732 G_CALLBACK (authenticate), NULL);
733@@ -571,7 +571,7 @@ main (int argc, char **argv)
734 apache_cleanup ();
735 g_main_context_unref (g_main_context_default ());
736
737- dprintf (1, "\n");
738+ dprintfsoup (1, "\n");
739 if (errors) {
740 printf ("pull-api: %d error(s). Run with '-d' for details\n",
741 errors);
742diff -rupN libsoup-2.2.105/tests/uri-parsing.c libsoup-2.2.105.new//tests/uri-parsing.c
743--- libsoup-2.2.105/tests/uri-parsing.c 2007-10-28 19:57:03.000000000 +0200
744+++ libsoup-2.2.105.new//tests/uri-parsing.c 2012-01-16 20:10:35.000000000 +0200
745@@ -10,7 +10,7 @@
746 gboolean debug = FALSE;
747
748 static void
749-dprintf (const char *format, ...)
750+dprintfsoup (const char *format, ...)
751 {
752 va_list args;
753
754@@ -113,21 +113,21 @@ do_uri (SoupUri *base_uri, const char *b
755 char *uri_string;
756
757 if (base_uri) {
758- dprintf ("<%s> + <%s> = <%s>? ", base_str, in_uri,
759+ dprintfsoup ("<%s> + <%s> = <%s>? ", base_str, in_uri,
760 out_uri ? out_uri : "ERR");
761 uri = soup_uri_new_with_base (base_uri, in_uri);
762 } else {
763- dprintf ("<%s> => <%s>? ", in_uri,
764+ dprintfsoup ("<%s> => <%s>? ", in_uri,
765 out_uri ? out_uri : "ERR");
766 uri = soup_uri_new (in_uri);
767 }
768
769 if (!uri) {
770 if (out_uri) {
771- dprintf ("ERR\n Could not parse %s\n", in_uri);
772+ dprintfsoup ("ERR\n Could not parse %s\n", in_uri);
773 return FALSE;
774 } else {
775- dprintf ("OK\n");
776+ dprintfsoup ("OK\n");
777 return TRUE;
778 }
779 }
780@@ -136,18 +136,18 @@ do_uri (SoupUri *base_uri, const char *b
781 soup_uri_free (uri);
782
783 if (!out_uri) {
784- dprintf ("ERR\n Got %s\n", uri_string);
785+ dprintfsoup ("ERR\n Got %s\n", uri_string);
786 return FALSE;
787 }
788
789 if (strcmp (uri_string, out_uri) != 0) {
790- dprintf ("NO\n Unparses to <%s>\n", uri_string);
791+ dprintfsoup ("NO\n Unparses to <%s>\n", uri_string);
792 g_free (uri_string);
793 return FALSE;
794 }
795 g_free (uri_string);
796
797- dprintf ("OK\n");
798+ dprintfsoup ("OK\n");
799 return TRUE;
800 }
801
802@@ -169,14 +169,14 @@ main (int argc, char **argv)
803 }
804 }
805
806- dprintf ("Absolute URI parsing\n");
807+ dprintfsoup ("Absolute URI parsing\n");
808 for (i = 0; i < num_abs_tests; i++) {
809 if (!do_uri (NULL, NULL, abs_tests[i].uri_string,
810 abs_tests[i].result))
811 errs++;
812 }
813
814- dprintf ("\nRelative URI parsing\n");
815+ dprintfsoup ("\nRelative URI parsing\n");
816 base_uri = soup_uri_new (base);
817 if (!base_uri) {
818 fprintf (stderr, "Could not parse %s!\n", base);
819@@ -198,7 +198,7 @@ main (int argc, char **argv)
820 }
821 soup_uri_free (base_uri);
822
823- dprintf ("\n");
824+ dprintfsoup ("\n");
825 if (errs) {
826 printf ("uri-parsing: %d error(s). Run with '-d' for details\n",
827 errs);
828diff -rupN libsoup-2.2.105/tests/xmlrpc-test.c libsoup-2.2.105.new//tests/xmlrpc-test.c
829--- libsoup-2.2.105/tests/xmlrpc-test.c 2008-02-08 04:19:00.000000000 +0200
830+++ libsoup-2.2.105.new//tests/xmlrpc-test.c 2012-01-16 20:12:18.000000000 +0200
831@@ -19,7 +19,7 @@ static const char *uri = "http://localho
832 int debug;
833
834 static void
835-dprintf (int level, const char *format, ...)
836+dprintfsoup (int level, const char *format, ...)
837 {
838 va_list args;
839
840@@ -54,13 +54,13 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
841 soup_xmlrpc_message_persist (xmsg);
842 status = soup_session_send_message (session, msg);
843
844- dprintf (3, "\n%.*s\n%d %s\n%.*s\n",
845+ dprintfsoup (3, "\n%.*s\n%d %s\n%.*s\n",
846 msg->request.length, msg->request.body,
847 msg->status_code, msg->reason_phrase,
848 msg->response.length, msg->response.body);
849
850 if (!SOUP_STATUS_IS_SUCCESSFUL (status)) {
851- dprintf (1, "ERROR: %d %s\n", status, msg->reason_phrase);
852+ dprintfsoup (1, "ERROR: %d %s\n", status, msg->reason_phrase);
853 g_object_unref (msg);
854 return FALSE;
855 }
856@@ -69,9 +69,9 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
857 g_object_unref (msg);
858 if (!response || soup_xmlrpc_response_is_fault (response)) {
859 if (!response)
860- dprintf (1, "ERROR: no response\n");
861+ dprintfsoup (1, "ERROR: no response\n");
862 else {
863- dprintf (1, "ERROR: fault\n");
864+ dprintfsoup (1, "ERROR: fault\n");
865 g_object_unref (response);
866 }
867 return FALSE;
868@@ -79,11 +79,11 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
869
870 value = soup_xmlrpc_response_get_value (response);
871 if (!value) {
872- dprintf (1, "ERROR: no value?\n");
873+ dprintfsoup (1, "ERROR: no value?\n");
874 g_object_unref (response);
875 return NULL;
876 } else if (soup_xmlrpc_value_get_type (value) != type) {
877- dprintf (1, "ERROR: wrong value type; expected %s, got %s\n",
878+ dprintfsoup (1, "ERROR: wrong value type; expected %s, got %s\n",
879 value_type[type], value_type[soup_xmlrpc_value_get_type (value)]);
880 g_object_unref (response);
881 return NULL;
882@@ -101,7 +101,7 @@ test_sum (void)
883 int i, val, sum;
884 long result;
885
886- dprintf (1, "sum (array of int -> int): ");
887+ dprintfsoup (1, "sum (array of int -> int): ");
888
889 msg = soup_xmlrpc_message_new (uri);
890 soup_xmlrpc_message_start_call (msg, "sum");
891@@ -109,11 +109,11 @@ test_sum (void)
892 soup_xmlrpc_message_start_array (msg);
893 for (i = sum = 0; i < 10; i++) {
894 val = rand () % 100;
895- dprintf (2, "%s%d", i == 0 ? "[" : ", ", val);
896+ dprintfsoup (2, "%s%d", i == 0 ? "[" : ", ", val);
897 soup_xmlrpc_message_write_int (msg, val);
898 sum += val;
899 }
900- dprintf (2, "] -> ");
901+ dprintfsoup (2, "] -> ");
902 soup_xmlrpc_message_end_array (msg);
903 soup_xmlrpc_message_end_param (msg);
904 soup_xmlrpc_message_end_call (msg);
905@@ -124,14 +124,14 @@ test_sum (void)
906 value = soup_xmlrpc_response_get_value (response);
907
908 if (!soup_xmlrpc_value_get_int (value, &result)) {
909- dprintf (1, "wrong type?\n");
910+ dprintfsoup (1, "wrong type?\n");
911 g_object_unref (response);
912 return FALSE;
913 }
914 g_object_unref (response);
915
916- dprintf (2, "%ld: ", result);
917- dprintf (1, "%s\n", result == sum ? "OK!" : "WRONG!");
918+ dprintfsoup (2, "%ld: ", result);
919+ dprintfsoup (1, "%s\n", result == sum ? "OK!" : "WRONG!");
920 return result == sum;
921 }
922
923@@ -146,7 +146,7 @@ test_countBools (void)
924 gboolean val, ok;
925 GHashTable *result;
926
927- dprintf (1, "countBools (array of boolean -> struct of ints): ");
928+ dprintfsoup (1, "countBools (array of boolean -> struct of ints): ");
929
930 msg = soup_xmlrpc_message_new (uri);
931 soup_xmlrpc_message_start_call (msg, "countBools");
932@@ -154,14 +154,14 @@ test_countBools (void)
933 soup_xmlrpc_message_start_array (msg);
934 for (i = trues = falses = 0; i < 10; i++) {
935 val = rand () > (RAND_MAX / 2);
936- dprintf (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
937+ dprintfsoup (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
938 soup_xmlrpc_message_write_boolean (msg, val);
939 if (val)
940 trues++;
941 else
942 falses++;
943 }
944- dprintf (2, "] -> ");
945+ dprintfsoup (2, "] -> ");
946 soup_xmlrpc_message_end_array (msg);
947 soup_xmlrpc_message_end_param (msg);
948 soup_xmlrpc_message_end_call (msg);
949@@ -172,19 +172,19 @@ test_countBools (void)
950 value = soup_xmlrpc_response_get_value (response);
951
952 if (!soup_xmlrpc_value_get_struct (value, &result)) {
953- dprintf (1, "wrong type?\n");
954+ dprintfsoup (1, "wrong type?\n");
955 g_object_unref (response);
956 return FALSE;
957 }
958
959 if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "true"), &ret_trues)) {
960- dprintf (1, "NO 'true' value in response\n");
961+ dprintfsoup (1, "NO 'true' value in response\n");
962 g_hash_table_destroy (result);
963 g_object_unref (response);
964 return FALSE;
965 }
966 if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "false"), &ret_falses)) {
967- dprintf (1, "NO 'false' value in response\n");
968+ dprintfsoup (1, "NO 'false' value in response\n");
969 g_hash_table_destroy (result);
970 g_object_unref (response);
971 return FALSE;
972@@ -192,9 +192,9 @@ test_countBools (void)
973 g_hash_table_destroy (result);
974 g_object_unref (response);
975
976- dprintf (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
977+ dprintfsoup (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
978 ok = (trues == ret_trues) && (falses == ret_falses);
979- dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
980+ dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
981 return ok;
982 }
983
984@@ -211,7 +211,7 @@ test_md5sum (void)
985 guchar digest[16];
986 gboolean ok;
987
988- dprintf (1, "md5sum (base64 -> base64): ");
989+ dprintfsoup (1, "md5sum (base64 -> base64): ");
990
991 msg = soup_xmlrpc_message_new (uri);
992 soup_xmlrpc_message_start_call (msg, "md5sum");
993@@ -228,14 +228,14 @@ test_md5sum (void)
994 value = soup_xmlrpc_response_get_value (response);
995
996 if (!soup_xmlrpc_value_get_base64 (value, &result)) {
997- dprintf (1, "wrong type?\n");
998+ dprintfsoup (1, "wrong type?\n");
999 g_object_unref (response);
1000 return FALSE;
1001 }
1002 g_object_unref (response);
1003
1004 if (result->len != 16) {
1005- dprintf (1, "result has WRONG length (%d)\n", result->len);
1006+ dprintfsoup (1, "result has WRONG length (%d)\n", result->len);
1007 g_byte_array_free (result, TRUE);
1008 return FALSE;
1009 }
1010@@ -245,7 +245,7 @@ test_md5sum (void)
1011 soup_md5_final (&md5, digest);
1012
1013 ok = (memcmp (digest, result->data, 16) == 0);
1014- dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
1015+ dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
1016 g_byte_array_free (result, TRUE);
1017 return ok;
1018 }
1019@@ -260,7 +260,7 @@ test_dateChange (void)
1020 time_t when, result;
1021 char timestamp[128];
1022
1023- dprintf (1, "dateChange (struct of time and ints -> time): ");
1024+ dprintfsoup (1, "dateChange (struct of time and ints -> time): ");
1025
1026 msg = soup_xmlrpc_message_new (uri);
1027 soup_xmlrpc_message_start_call (msg, "dateChange");
1028@@ -281,53 +281,53 @@ test_dateChange (void)
1029
1030 strftime (timestamp, sizeof (timestamp),
1031 "%Y-%m-%dT%H:%M:%S", &tm);
1032- dprintf (2, "{ date: %s", timestamp);
1033+ dprintfsoup (2, "{ date: %s", timestamp);
1034
1035 if (rand () % 3) {
1036 tm.tm_year = 70 + (rand () % 50);
1037- dprintf (2, ", tm_year: %d", tm.tm_year);
1038+ dprintfsoup (2, ", tm_year: %d", tm.tm_year);
1039 soup_xmlrpc_message_start_member (msg, "tm_year");
1040 soup_xmlrpc_message_write_int (msg, tm.tm_year);
1041 soup_xmlrpc_message_end_member (msg);
1042 }
1043 if (rand () % 3) {
1044 tm.tm_mon = rand () % 12;
1045- dprintf (2, ", tm_mon: %d", tm.tm_mon);
1046+ dprintfsoup (2, ", tm_mon: %d", tm.tm_mon);
1047 soup_xmlrpc_message_start_member (msg, "tm_mon");
1048 soup_xmlrpc_message_write_int (msg, tm.tm_mon);
1049 soup_xmlrpc_message_end_member (msg);
1050 }
1051 if (rand () % 3) {
1052 tm.tm_mday = 1 + (rand () % 28);
1053- dprintf (2, ", tm_mday: %d", tm.tm_mday);
1054+ dprintfsoup (2, ", tm_mday: %d", tm.tm_mday);
1055 soup_xmlrpc_message_start_member (msg, "tm_mday");
1056 soup_xmlrpc_message_write_int (msg, tm.tm_mday);
1057 soup_xmlrpc_message_end_member (msg);
1058 }
1059 if (rand () % 3) {
1060 tm.tm_hour = rand () % 24;
1061- dprintf (2, ", tm_hour: %d", tm.tm_hour);
1062+ dprintfsoup (2, ", tm_hour: %d", tm.tm_hour);
1063 soup_xmlrpc_message_start_member (msg, "tm_hour");
1064 soup_xmlrpc_message_write_int (msg, tm.tm_hour);
1065 soup_xmlrpc_message_end_member (msg);
1066 }
1067 if (rand () % 3) {
1068 tm.tm_min = rand () % 60;
1069- dprintf (2, ", tm_min: %d", tm.tm_min);
1070+ dprintfsoup (2, ", tm_min: %d", tm.tm_min);
1071 soup_xmlrpc_message_start_member (msg, "tm_min");
1072 soup_xmlrpc_message_write_int (msg, tm.tm_min);
1073 soup_xmlrpc_message_end_member (msg);
1074 }
1075 if (rand () % 3) {
1076 tm.tm_sec = rand () % 60;
1077- dprintf (2, ", tm_sec: %d", tm.tm_sec);
1078+ dprintfsoup (2, ", tm_sec: %d", tm.tm_sec);
1079 soup_xmlrpc_message_start_member (msg, "tm_sec");
1080 soup_xmlrpc_message_write_int (msg, tm.tm_sec);
1081 soup_xmlrpc_message_end_member (msg);
1082 }
1083 when = soup_mktime_utc (&tm);
1084
1085- dprintf (2, " } -> ");
1086+ dprintfsoup (2, " } -> ");
1087
1088 soup_xmlrpc_message_end_struct (msg);
1089 soup_xmlrpc_message_end_param (msg);
1090@@ -339,7 +339,7 @@ test_dateChange (void)
1091 value = soup_xmlrpc_response_get_value (response);
1092
1093 if (!soup_xmlrpc_value_get_datetime (value, &result)) {
1094- dprintf (1, "wrong type?\n");
1095+ dprintfsoup (1, "wrong type?\n");
1096 g_object_unref (response);
1097 return FALSE;
1098 }
1099@@ -348,9 +348,9 @@ test_dateChange (void)
1100 memset (&tm, 0, sizeof (tm));
1101 soup_gmtime (&result, &tm);
1102 strftime (timestamp, sizeof (timestamp), "%Y-%m-%dT%H:%M:%S", &tm);
1103- dprintf (2, "%s: ", timestamp);
1104+ dprintfsoup (2, "%s: ", timestamp);
1105
1106- dprintf (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
1107+ dprintfsoup (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
1108 return (when == result);
1109 }
1110
1111@@ -372,17 +372,17 @@ test_echo (void)
1112 char *echo;
1113 int i;
1114
1115- dprintf (1, "echo (array of string -> array of string): ");
1116+ dprintfsoup (1, "echo (array of string -> array of string): ");
1117
1118 msg = soup_xmlrpc_message_new (uri);
1119 soup_xmlrpc_message_start_call (msg, "echo");
1120 soup_xmlrpc_message_start_param (msg);
1121 soup_xmlrpc_message_start_array (msg);
1122 for (i = 0; i < N_ECHO_STRINGS; i++) {
1123- dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
1124+ dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
1125 soup_xmlrpc_message_write_string (msg, echo_strings[i]);
1126 }
1127- dprintf (2, "] -> ");
1128+ dprintfsoup (2, "] -> ");
1129 soup_xmlrpc_message_end_array (msg);
1130 soup_xmlrpc_message_end_param (msg);
1131 soup_xmlrpc_message_end_call (msg);
1132@@ -393,25 +393,25 @@ test_echo (void)
1133 value = soup_xmlrpc_response_get_value (response);
1134
1135 if (!soup_xmlrpc_value_array_get_iterator (value, &iter)) {
1136- dprintf (1, "wrong type?\n");
1137+ dprintfsoup (1, "wrong type?\n");
1138 g_object_unref (response);
1139 return FALSE;
1140 }
1141 i = 0;
1142 while (iter) {
1143 if (!soup_xmlrpc_value_array_iterator_get_value (iter, &elt)) {
1144- dprintf (1, " WRONG! Can't get result element %d\n", i + 1);
1145+ dprintfsoup (1, " WRONG! Can't get result element %d\n", i + 1);
1146 g_object_unref (response);
1147 return FALSE;
1148 }
1149 if (!soup_xmlrpc_value_get_string (elt, &echo)) {
1150- dprintf (1, " WRONG! Result element %d is not a string", i + 1);
1151+ dprintfsoup (1, " WRONG! Result element %d is not a string", i + 1);
1152 g_object_unref (response);
1153 return FALSE;
1154 }
1155- dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
1156+ dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
1157 if (strcmp (echo_strings[i], echo) != 0) {
1158- dprintf (1, " WRONG! Mismatch at %d\n", i + 1);
1159+ dprintfsoup (1, " WRONG! Mismatch at %d\n", i + 1);
1160 g_free (echo);
1161 g_object_unref (response);
1162 return FALSE;
1163@@ -421,10 +421,10 @@ test_echo (void)
1164 iter = soup_xmlrpc_value_array_iterator_next (iter);
1165 i++;
1166 }
1167- dprintf (2, "] ");
1168+ dprintfsoup (2, "] ");
1169 g_object_unref (response);
1170
1171- dprintf (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
1172+ dprintfsoup (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
1173 return i == N_ECHO_STRINGS;
1174 }
1175
1176@@ -480,7 +480,7 @@ main (int argc, char **argv)
1177
1178 apache_cleanup ();
1179
1180- dprintf (1, "\n");
1181+ dprintfsoup (1, "\n");
1182 if (errors) {
1183 printf ("xmlrpc-test: %d error(s). Run with '-d' for details\n",
1184 errors);
diff --git a/meta/recipes-support/libsoup/libsoup_2.2.100.bb b/meta/recipes-support/libsoup/libsoup_2.2.105.bb
index cc9846aa3a..6ad90b8c42 100644
--- a/meta/recipes-support/libsoup/libsoup_2.2.100.bb
+++ b/meta/recipes-support/libsoup/libsoup_2.2.105.bb
@@ -2,14 +2,15 @@ DESCRIPTION = "An HTTP library implementation in C"
2SECTION = "x11/gnome/libs" 2SECTION = "x11/gnome/libs"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" 4LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
5PR = "r1" 5PR = "r0"
6 6
7DEPENDS = "glib-2.0 gnutls libxml2" 7DEPENDS = "glib-2.0 gnutls libxml2"
8 8
9SRC_URI = "${GNOME_MIRROR}/${BPN}/2.2/${BPN}-${PV}.tar.bz2" 9SRC_URI = "${GNOME_MIRROR}/${BPN}/2.2/${BPN}-${PV}.tar.bz2 \
10 file://dprintf_conflict_with_eglibc.patch"
10 11
11SRC_URI[md5sum] = "936e29d705aab0483b9a5b8860f68c13" 12SRC_URI[md5sum] = "7fa48b06a0e2b0ff3d2fa45cf331f169"
12SRC_URI[sha256sum] = "fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d" 13SRC_URI[sha256sum] = "3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f"
13 14
14inherit autotools pkgconfig 15inherit autotools pkgconfig
15 16
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 00:25:35 +0000