summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2018-03-20 10:47:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:01 +0100
commitce8d120bfc1015ea23944ebbcfa3b536eeea2d6c (patch)
tree9f6060962683a67e4390f794f560bfc9a1ae1f80 /meta
parent49e0838e1d2cb9e07b0e66a1220f13be251f255c (diff)
downloadpoky-ce8d120bfc1015ea23944ebbcfa3b536eeea2d6c.tar.gz
libxml2: 2.9.7 -> 2.9.8
(From OE-Core rev: de24ead63802523daa19ce8528ac95d9e041eaf8) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/libxml/libxml2/ansidecl.patch25
-rw-r--r--meta/recipes-core/libxml/libxml2/runtest.patch151
-rw-r--r--meta/recipes-core/libxml/libxml2_2.9.8.bb (renamed from meta/recipes-core/libxml/libxml2_2.9.7.bb)5
3 files changed, 78 insertions, 103 deletions
diff --git a/meta/recipes-core/libxml/libxml2/ansidecl.patch b/meta/recipes-core/libxml/libxml2/ansidecl.patch
deleted file mode 100644
index 1085c680b6..0000000000
--- a/meta/recipes-core/libxml/libxml2/ansidecl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Sadly cmake is broken. If it sees this reference and ansidecl is present, it will add a
2dependency upon it, even if HAVE_ANSIDEC_H is never set.
3
4The easiest solution is to remove these lines, otherwise recipes like libzypp can have a
5dependency on the ansidecl.h header via cmake. This can lead to odd results if the
6header is removed (clean binutils) and then the code is recompiled.
7
8RP 2012/7/10
9
10Upstream-Status: Inappropriate [its really a cmake bug]
11
12diff --git a/configure.ac b/configure.ac
13index 0260281..fdb58e9 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -484 +483,0 @@ AC_CHECK_HEADERS([time.h])
17-AC_CHECK_HEADERS([ansidecl.h])
18diff --git a/include/libxml/xmlversion.h.in b/include/libxml/xmlversion.h.in
19index b173be9..d10f975 100644
20--- a/include/libxml/xmlversion.h.in
21+++ b/include/libxml/xmlversion.h.in
22@@ -413,3 +412,0 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
23-#ifdef HAVE_ANSIDECL_H
24-#include <ansidecl.h>
25-#endif
diff --git a/meta/recipes-core/libxml/libxml2/runtest.patch b/meta/recipes-core/libxml/libxml2/runtest.patch
index cb171d5b36..544dc05834 100644
--- a/meta/recipes-core/libxml/libxml2/runtest.patch
+++ b/meta/recipes-core/libxml/libxml2/runtest.patch
@@ -6,8 +6,8 @@ Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
6Upstream-Status: Backport 6Upstream-Status: Backport
7 7
8diff -uNr a/Makefile.am b/Makefile.am 8diff -uNr a/Makefile.am b/Makefile.am
9--- a/Makefile.am 2017-08-28 15:01:14.000000000 +0200 9--- a/Makefile.am 2017-12-02 09:58:10.000000000 +0100
10+++ b/Makefile.am 2017-09-05 08:06:05.752287323 +0200 10+++ b/Makefile.am 2018-03-20 08:27:34.360505864 +0100
11@@ -202,6 +202,15 @@ 11@@ -202,6 +202,15 @@
12 #testOOM_DEPENDENCIES = $(DEPS) 12 #testOOM_DEPENDENCIES = $(DEPS)
13 #testOOM_LDADD= $(LDADDS) 13 #testOOM_LDADD= $(LDADDS)
@@ -24,10 +24,9 @@ diff -uNr a/Makefile.am b/Makefile.am
24 runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ 24 runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \
25 testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) 25 testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT)
26 [ -d test ] || $(LN_S) $(srcdir)/test . 26 [ -d test ] || $(LN_S) $(srcdir)/test .
27
28diff -uNr a/runsuite.c b/runsuite.c 27diff -uNr a/runsuite.c b/runsuite.c
29--- a/runsuite.c 2013-04-12 16:17:11.462823238 +0200 28--- a/runsuite.c 2016-06-07 12:04:14.000000000 +0200
30+++ b/runsuite.c 2013-04-17 14:07:24.352693211 +0200 29+++ b/runsuite.c 2018-03-20 08:27:57.478817247 +0100
31@@ -1162,6 +1162,7 @@ 30@@ -1162,6 +1162,7 @@
32 31
33 if (logfile != NULL) 32 if (logfile != NULL)
@@ -37,17 +36,19 @@ diff -uNr a/runsuite.c b/runsuite.c
37 } 36 }
38 #else /* !SCHEMAS */ 37 #else /* !SCHEMAS */
39diff -uNr a/runtest.c b/runtest.c 38diff -uNr a/runtest.c b/runtest.c
40--- a/runtest.c 2013-04-16 13:19:15.087997290 +0200 39--- a/runtest.c 2017-11-13 22:00:17.000000000 +0100
41+++ b/runtest.c 2013-04-17 14:08:29.529949655 +0200 40+++ b/runtest.c 2018-03-20 08:28:50.859047551 +0100
42@@ -4386,6 +4386,7 @@ 41@@ -4496,7 +4496,8 @@
43 err++;
44 }
45 } 42 }
43
44 xmlCharEncCloseFunc(ebcdicHandler);
45-
46+
46+ printf("%s: %s\n", (err == 0) ? "PASS" : "FAIL", tst->desc); 47+ printf("%s: %s\n", (err == 0) ? "PASS" : "FAIL", tst->desc);
47 return(err); 48 return(err);
48 } 49 }
49 50
50@@ -4455,6 +4456,7 @@ 51@@ -4573,6 +4574,7 @@
51 xmlCleanupParser(); 52 xmlCleanupParser();
52 xmlMemoryDump(); 53 xmlMemoryDump();
53 54
@@ -56,8 +57,8 @@ diff -uNr a/runtest.c b/runtest.c
56 } 57 }
57 58
58diff -uNr a/runxmlconf.c b/runxmlconf.c 59diff -uNr a/runxmlconf.c b/runxmlconf.c
59--- a/runxmlconf.c 2013-04-16 12:53:49.900982990 +0200 60--- a/runxmlconf.c 2016-06-07 12:04:14.000000000 +0200
60+++ b/runxmlconf.c 2013-04-17 14:09:21.111778104 +0200 61+++ b/runxmlconf.c 2018-03-20 08:29:17.944862893 +0100
61@@ -595,6 +595,7 @@ 62@@ -595,6 +595,7 @@
62 63
63 if (logfile != NULL) 64 if (logfile != NULL)
@@ -67,9 +68,9 @@ diff -uNr a/runxmlconf.c b/runxmlconf.c
67 } 68 }
68 69
69diff -uNr a/testapi.c b/testapi.c 70diff -uNr a/testapi.c b/testapi.c
70--- a/testapi.c 2013-04-12 16:16:57.763417659 +0200 71--- a/testapi.c 2018-01-25 07:39:15.000000000 +0100
71+++ b/testapi.c 2013-04-17 14:10:28.876924881 +0200 72+++ b/testapi.c 2018-03-20 09:08:35.323980145 +0100
72@@ -1245,49 +1245,91 @@ 73@@ -1246,49 +1246,91 @@
73 testlibxml2(void) 74 testlibxml2(void)
74 { 75 {
75 int test_ret = 0; 76 int test_ret = 0;
@@ -200,9 +201,19 @@ diff -uNr a/testapi.c b/testapi.c
200 return(test_ret); 201 return(test_ret);
201 } 202 }
202 203
204diff -uNr a/testdict.c b/testdict.c
205--- a/testdict.c 2016-06-07 12:04:14.000000000 +0200
206+++ b/testdict.c 2018-03-20 08:59:16.864275812 +0100
207@@ -440,5 +440,6 @@
208 clean_strings();
209 xmlCleanupParser();
210 xmlMemoryDump();
211+ printf("%s: testdict\n\n", (ret == 0) ? "PASS" : "FAIL");
212 return(ret);
213 }
203diff -uNr a/testchar.c b/testchar.c 214diff -uNr a/testchar.c b/testchar.c
204--- a/testchar.c 2013-04-17 10:50:30.250147418 +0200 215--- a/testchar.c 2016-06-07 12:04:14.000000000 +0200
205+++ b/testchar.c 2013-04-18 16:11:28.455733800 +0200 216+++ b/testchar.c 2018-03-20 09:11:20.383573912 +0100
206@@ -23,7 +23,7 @@ 217@@ -23,7 +23,7 @@
207 char document1[100] = "<doc>XXXX</doc>"; 218 char document1[100] = "<doc>XXXX</doc>";
208 char document2[100] = "<doc foo='XXXX'/>"; 219 char document2[100] = "<doc foo='XXXX'/>";
@@ -222,7 +233,7 @@ diff -uNr a/testchar.c b/testchar.c
222 "Failed to detect invalid char for Byte 0x%02X: %c\n", 233 "Failed to detect invalid char for Byte 0x%02X: %c\n",
223 i, i); 234 i, i);
224+ return(1); 235+ return(1);
225+ } 236+ }
226 } 237 }
227 238
228 else if ((i == '<') || (i == '&')) { 239 else if ((i == '<') || (i == '&')) {
@@ -230,8 +241,8 @@ diff -uNr a/testchar.c b/testchar.c
230+ if ((lastError == 0) || (res != NULL)) { 241+ if ((lastError == 0) || (res != NULL)) {
231 fprintf(stderr, 242 fprintf(stderr,
232 "Failed to detect illegal char %c for Byte 0x%02X\n", i, i); 243 "Failed to detect illegal char %c for Byte 0x%02X\n", i, i);
233+ return(1); 244+ return(1);
234+ } 245+ }
235 } 246 }
236 else if (((i < 0x20) || (i >= 0x80)) && 247 else if (((i < 0x20) || (i >= 0x80)) &&
237 (i != 0x9) && (i != 0xA) && (i != 0xD)) { 248 (i != 0x9) && (i != 0xA) && (i != 0xD)) {
@@ -239,8 +250,8 @@ diff -uNr a/testchar.c b/testchar.c
239+ if ((lastError != XML_ERR_INVALID_CHAR) && (res != NULL)) { 250+ if ((lastError != XML_ERR_INVALID_CHAR) && (res != NULL)) {
240 fprintf(stderr, 251 fprintf(stderr,
241 "Failed to detect invalid char for Byte 0x%02X\n", i); 252 "Failed to detect invalid char for Byte 0x%02X\n", i);
242+ return(1); 253+ return(1);
243+ } 254+ }
244 } 255 }
245 else if (res == NULL) { 256 else if (res == NULL) {
246 fprintf(stderr, 257 fprintf(stderr,
@@ -250,7 +261,7 @@ diff -uNr a/testchar.c b/testchar.c
250 if (res != NULL) 261 if (res != NULL)
251 xmlFreeDoc(res); 262 xmlFreeDoc(res);
252 } 263 }
253+ return(0); 264+ return(0);
254 } 265 }
255 266
256-static void testDocumentRangeByte2(xmlParserCtxtPtr ctxt, char *document, 267-static void testDocumentRangeByte2(xmlParserCtxtPtr ctxt, char *document,
@@ -268,7 +279,7 @@ diff -uNr a/testchar.c b/testchar.c
268 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n", 279 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n",
269 i, j); 280 i, j);
270+ return(1); 281+ return(1);
271+ } 282+ }
272 } 283 }
273 284
274 /* 285 /*
@@ -282,7 +293,7 @@ diff -uNr a/testchar.c b/testchar.c
282 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n", 293 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n",
283 i, j); 294 i, j);
284+ return(1); 295+ return(1);
285+ } 296+ }
286 } 297 }
287 298
288 /* 299 /*
@@ -296,7 +307,7 @@ diff -uNr a/testchar.c b/testchar.c
296 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n", 307 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n",
297 i, j); 308 i, j);
298+ return(1); 309+ return(1);
299+ } 310+ }
300 } 311 }
301 312
302 /* 313 /*
@@ -310,7 +321,7 @@ diff -uNr a/testchar.c b/testchar.c
310 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x00\n", 321 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x00\n",
311 i, j); 322 i, j);
312+ return(1); 323+ return(1);
313+ } 324+ }
314 } 325 }
315 326
316 /* 327 /*
@@ -318,13 +329,13 @@ diff -uNr a/testchar.c b/testchar.c
318 else if ((lastError != 0) || (res == NULL)) { 329 else if ((lastError != 0) || (res == NULL)) {
319 fprintf(stderr, 330 fprintf(stderr,
320 "Failed to parse document for Bytes 0x%02X 0x%02X\n", i, j); 331 "Failed to parse document for Bytes 0x%02X 0x%02X\n", i, j);
321+ return(1); 332+ return(1);
322 } 333 }
323 if (res != NULL) 334 if (res != NULL)
324 xmlFreeDoc(res); 335 xmlFreeDoc(res);
325 } 336 }
326 } 337 }
327+ return(0); 338+ return(0);
328 } 339 }
329 340
330 /** 341 /**
@@ -438,20 +449,20 @@ diff -uNr a/testchar.c b/testchar.c
438+ if (lastError != XML_ERR_INVALID_CHAR) { 449+ if (lastError != XML_ERR_INVALID_CHAR) {
439 fprintf(stderr, 450 fprintf(stderr,
440 "Failed to detect invalid char for Byte 0x%02X\n", i); 451 "Failed to detect invalid char for Byte 0x%02X\n", i);
441+ return(1); 452+ return(1);
442+ } 453+ }
443 } else if (i == 0xD) { 454 } else if (i == 0xD) {
444- if ((c != 0xA) || (len != 1)) 455- if ((c != 0xA) || (len != 1))
445+ if ((c != 0xA) || (len != 1)) { 456+ if ((c != 0xA) || (len != 1)) {
446 fprintf(stderr, "Failed to convert char for Byte 0x%02X\n", i); 457 fprintf(stderr, "Failed to convert char for Byte 0x%02X\n", i);
447+ return(1); 458+ return(1);
448+ } 459+ }
449 } else if ((c != i) || (len != 1)) { 460 } else if ((c != i) || (len != 1)) {
450 fprintf(stderr, "Failed to parse char for Byte 0x%02X\n", i); 461 fprintf(stderr, "Failed to parse char for Byte 0x%02X\n", i);
451+ return(1); 462+ return(1);
452 } 463 }
453 } 464 }
454+ return(0); 465+ return(0);
455 } 466 }
456 467
457-static void testCharRangeByte2(xmlParserCtxtPtr ctxt, char *data) { 468-static void testCharRangeByte2(xmlParserCtxtPtr ctxt, char *data) {
@@ -468,8 +479,8 @@ diff -uNr a/testchar.c b/testchar.c
468 fprintf(stderr, 479 fprintf(stderr,
469 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n", 480 "Failed to detect invalid char for Bytes 0x%02X 0x%02X\n",
470 i, j); 481 i, j);
471+ return(1); 482+ return(1);
472+ } 483+ }
473 } 484 }
474 485
475 /* 486 /*
@@ -482,8 +493,8 @@ diff -uNr a/testchar.c b/testchar.c
482 fprintf(stderr, 493 fprintf(stderr,
483 "Failed to detect invalid char for Bytes 0x%02X 0x%02X: %d\n", 494 "Failed to detect invalid char for Bytes 0x%02X 0x%02X: %d\n",
484 i, j, c); 495 i, j, c);
485+ return(1); 496+ return(1);
486+ } 497+ }
487 } 498 }
488 499
489 /* 500 /*
@@ -496,8 +507,8 @@ diff -uNr a/testchar.c b/testchar.c
496 fprintf(stderr, 507 fprintf(stderr,
497 "Failed to detect invalid char for Bytes 0x%02X 0x%02X: %d\n", 508 "Failed to detect invalid char for Bytes 0x%02X 0x%02X: %d\n",
498 i, j, c); 509 i, j, c);
499+ return(1); 510+ return(1);
500+ } 511+ }
501 } 512 }
502 513
503 /* 514 /*
@@ -510,8 +521,8 @@ diff -uNr a/testchar.c b/testchar.c
510 fprintf(stderr, 521 fprintf(stderr,
511 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x00\n", 522 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x00\n",
512 i, j); 523 i, j);
513+ return(1); 524+ return(1);
514+ } 525+ }
515 } 526 }
516 527
517 /* 528 /*
@@ -531,7 +542,7 @@ diff -uNr a/testchar.c b/testchar.c
531 } 542 }
532 } 543 }
533 } 544 }
534+ return(0); 545+ return(0);
535 } 546 }
536 547
537-static void testCharRangeByte3(xmlParserCtxtPtr ctxt, char *data) { 548-static void testCharRangeByte3(xmlParserCtxtPtr ctxt, char *data) {
@@ -549,7 +560,7 @@ diff -uNr a/testchar.c b/testchar.c
549 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n", 560 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n",
550 i, j, K, data[3]); 561 i, j, K, data[3]);
551+ return(1); 562+ return(1);
552+ } 563+ }
553 } 564 }
554 565
555 /* 566 /*
@@ -562,7 +573,7 @@ diff -uNr a/testchar.c b/testchar.c
562 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X\n", 573 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X\n",
563 i, j, K); 574 i, j, K);
564+ return(1); 575+ return(1);
565+ } 576+ }
566 } 577 }
567 578
568 /* 579 /*
@@ -576,7 +587,7 @@ diff -uNr a/testchar.c b/testchar.c
576 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X\n", 587 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X\n",
577 i, j, K); 588 i, j, K);
578+ return(1); 589+ return(1);
579+ } 590+ }
580 } 591 }
581 592
582 /* 593 /*
@@ -590,7 +601,7 @@ diff -uNr a/testchar.c b/testchar.c
590 "Failed to detect invalid char 0x%04X for Bytes 0x%02X 0x%02X 0x%02X\n", 601 "Failed to detect invalid char 0x%04X for Bytes 0x%02X 0x%02X 0x%02X\n",
591 value, i, j, K); 602 value, i, j, K);
592+ return(1); 603+ return(1);
593+ } 604+ }
594 } 605 }
595 606
596 /* 607 /*
@@ -598,7 +609,7 @@ diff -uNr a/testchar.c b/testchar.c
598 fprintf(stderr, 609 fprintf(stderr,
599 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X\n", 610 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X\n",
600 i, j, K); 611 i, j, K);
601+ return(1); 612+ return(1);
602 } 613 }
603 614
604 /* 615 /*
@@ -606,12 +617,12 @@ diff -uNr a/testchar.c b/testchar.c
606 fprintf(stderr, 617 fprintf(stderr,
607 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X: expect %d got %d\n", 618 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X: expect %d got %d\n",
608 i, j, data[2], value, c); 619 i, j, data[2], value, c);
609+ return(1); 620+ return(1);
610 } 621 }
611 } 622 }
612 } 623 }
613 } 624 }
614+ return(0); 625+ return(0);
615 } 626 }
616 627
617-static void testCharRangeByte4(xmlParserCtxtPtr ctxt, char *data) { 628-static void testCharRangeByte4(xmlParserCtxtPtr ctxt, char *data) {
@@ -629,7 +640,7 @@ diff -uNr a/testchar.c b/testchar.c
629 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n", 640 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n",
630 i, j, K, data[3]); 641 i, j, K, data[3]);
631+ return(1); 642+ return(1);
632+ } 643+ }
633 } 644 }
634 645
635 /* 646 /*
@@ -643,7 +654,7 @@ diff -uNr a/testchar.c b/testchar.c
643 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n", 654 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n",
644 i, j, K, L); 655 i, j, K, L);
645+ return(1); 656+ return(1);
646+ } 657+ }
647 } 658 }
648 659
649 /* 660 /*
@@ -657,7 +668,7 @@ diff -uNr a/testchar.c b/testchar.c
657 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n", 668 "Failed to detect invalid char for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n",
658 i, j, K, L); 669 i, j, K, L);
659+ return(1); 670+ return(1);
660+ } 671+ }
661 } 672 }
662 673
663 /* 674 /*
@@ -671,7 +682,7 @@ diff -uNr a/testchar.c b/testchar.c
671 "Failed to detect invalid char 0x%04X for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n", 682 "Failed to detect invalid char 0x%04X for Bytes 0x%02X 0x%02X 0x%02X 0x%02X\n",
672 value, i, j, K, L); 683 value, i, j, K, L);
673+ return(1); 684+ return(1);
674+ } 685+ }
675 } 686 }
676 687
677 /* 688 /*
@@ -679,7 +690,7 @@ diff -uNr a/testchar.c b/testchar.c
679 fprintf(stderr, 690 fprintf(stderr,
680 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X\n", 691 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X\n",
681 i, j, K); 692 i, j, K);
682+ return(1); 693+ return(1);
683 } 694 }
684 695
685 /* 696 /*
@@ -687,13 +698,13 @@ diff -uNr a/testchar.c b/testchar.c
687 fprintf(stderr, 698 fprintf(stderr,
688 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X: expect %d got %d\n", 699 "Failed to parse char for Bytes 0x%02X 0x%02X 0x%02X: expect %d got %d\n",
689 i, j, data[2], value, c); 700 i, j, data[2], value, c);
690+ return(1); 701+ return(1);
691 } 702 }
692 } 703 }
693 } 704 }
694 } 705 }
695 } 706 }
696+ return(0); 707+ return(0);
697 } 708 }
698 709
699 /** 710 /**
@@ -722,13 +733,13 @@ diff -uNr a/testchar.c b/testchar.c
722 XML_CHAR_ENCODING_NONE); 733 XML_CHAR_ENCODING_NONE);
723 if (buf == NULL) { 734 if (buf == NULL) {
724 fprintf(stderr, "Failed to allocate input buffer\n"); 735 fprintf(stderr, "Failed to allocate input buffer\n");
725+ test_ret = 1; 736+ test_ret = 1;
726 goto error; 737 goto error;
727 } 738 }
728 input = xmlNewInputStream(ctxt); 739 input = xmlNewInputStream(ctxt);
729 if (input == NULL) { 740 if (input == NULL) {
730 xmlFreeParserInputBuffer(buf); 741 xmlFreeParserInputBuffer(buf);
731+ test_ret = 1; 742+ test_ret = 1;
732 goto error; 743 goto error;
733 } 744 }
734 input->filename = NULL; 745 input->filename = NULL;
@@ -777,20 +788,10 @@ diff -uNr a/testchar.c b/testchar.c
777 788
778 /* 789 /*
779 * Cleanup function for the XML library. 790 * Cleanup function for the XML library.
780diff -uNr a/testdict.c b/testdict.c
781--- a/testdict.c 2013-04-16 15:08:42.971177193 +0200
782+++ b/testdict.c 2013-04-18 15:59:00.699482439 +0200
783@@ -440,5 +440,6 @@
784 clean_strings();
785 xmlCleanupParser();
786 xmlMemoryDump();
787+ printf("%s: testdict\n\n", (ret == 0) ? "PASS" : "FAIL");
788 return(ret);
789 }
790diff -uNr a/testlimits.c b/testlimits.c 791diff -uNr a/testlimits.c b/testlimits.c
791--- a/testlimits.c 2013-04-12 16:16:36.180354177 +0200 792--- a/testlimits.c 2016-11-07 09:41:40.000000000 +0100
792+++ b/testlimits.c 2013-04-17 14:03:17.203092987 +0200 793+++ b/testlimits.c 2018-03-20 08:59:38.965581280 +0100
793@@ -1630,5 +1630,6 @@ 794@@ -1634,5 +1634,6 @@
794 xmlCleanupParser(); 795 xmlCleanupParser();
795 xmlMemoryDump(); 796 xmlMemoryDump();
796 797
@@ -798,8 +799,8 @@ diff -uNr a/testlimits.c b/testlimits.c
798 return(ret); 799 return(ret);
799 } 800 }
800diff -uNr a/testrecurse.c b/testrecurse.c 801diff -uNr a/testrecurse.c b/testrecurse.c
801--- a/testrecurse.c 2013-04-16 13:19:49.366536295 +0200 802--- a/testrecurse.c 2017-10-26 09:54:40.000000000 +0200
802+++ b/testrecurse.c 2013-04-17 14:06:27.367091622 +0200 803+++ b/testrecurse.c 2018-03-20 09:00:46.781628749 +0100
803@@ -892,6 +892,7 @@ 804@@ -892,6 +892,7 @@
804 err++; 805 err++;
805 } 806 }
diff --git a/meta/recipes-core/libxml/libxml2_2.9.7.bb b/meta/recipes-core/libxml/libxml2_2.9.8.bb
index 2fb90a68a8..d55e650911 100644
--- a/meta/recipes-core/libxml/libxml2_2.9.7.bb
+++ b/meta/recipes-core/libxml/libxml2_2.9.8.bb
@@ -14,7 +14,6 @@ DEPENDS = "zlib virtual/libiconv"
14SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ 14SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
15 http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ 15 http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \
16 file://libxml-64bit.patch \ 16 file://libxml-64bit.patch \
17 file://ansidecl.patch \
18 file://runtest.patch \ 17 file://runtest.patch \
19 file://run-ptest \ 18 file://run-ptest \
20 file://python-sitepackages-dir.patch \ 19 file://python-sitepackages-dir.patch \
@@ -23,8 +22,8 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \
23 file://fix-execution-of-ptests.patch \ 22 file://fix-execution-of-ptests.patch \
24 " 23 "
25 24
26SRC_URI[libtar.md5sum] = "896608641a08b465098a40ddf51cefba" 25SRC_URI[libtar.md5sum] = "b786e353e2aa1b872d70d5d1ca0c740d"
27SRC_URI[libtar.sha256sum] = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c" 26SRC_URI[libtar.sha256sum] = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732"
28SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" 27SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a"
29SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" 28SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7"
30 29