diff options
-rw-r--r-- | meta/recipes-core/libxml/libxml2/install-tests.patch | 4 | ||||
-rwxr-xr-x | meta/recipes-core/libxml/libxml2/run-ptest | 2 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.14.3.bb (renamed from meta/recipes-core/libxml/libxml2_2.13.8.bb) | 9 |
3 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 1c8c13ab5c..789aeca119 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch | |||
@@ -15,7 +15,7 @@ diff --git a/Makefile.am b/Makefile.am | |||
15 | index 4cb9a5c..8adcd7e 100644 | 15 | index 4cb9a5c..8adcd7e 100644 |
16 | --- a/Makefile.am | 16 | --- a/Makefile.am |
17 | +++ b/Makefile.am | 17 | +++ b/Makefile.am |
18 | @@ -27,6 +27,16 @@ check_PROGRAMS = \ | 18 | @@ -26,6 +26,16 @@ check_PROGRAMS = \ |
19 | testparser \ | 19 | testparser \ |
20 | testrecurse | 20 | testrecurse |
21 | 21 | ||
@@ -29,6 +29,6 @@ index 4cb9a5c..8adcd7e 100644 | |||
29 | + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) | 29 | + cp -r $(srcdir)/result $(DESTDIR)$(ptestdir) |
30 | + cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python | 30 | + cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python |
31 | + | 31 | + |
32 | bin_PROGRAMS = xmllint xmlcatalog | 32 | bin_PROGRAMS = xmllint |
33 | 33 | ||
34 | bin_SCRIPTS = xml2-config | 34 | bin_SCRIPTS = xml2-config |
diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/meta/recipes-core/libxml/libxml2/run-ptest index f252a78f17..cbbdd5592f 100755 --- a/meta/recipes-core/libxml/libxml2/run-ptest +++ b/meta/recipes-core/libxml/libxml2/run-ptest | |||
@@ -5,7 +5,7 @@ set -e | |||
5 | export LC_ALL=en_US.UTF-8 | 5 | export LC_ALL=en_US.UTF-8 |
6 | 6 | ||
7 | # testModule isn't that useful and hard-codes buildtree, so we don't run that | 7 | # testModule isn't that useful and hard-codes buildtree, so we don't run that |
8 | TESTS="runtest runsuite testrecurse testchar testdict testThreads runxmlconf testapi" | 8 | TESTS="runtest runsuite testrecurse testchar testdict runxmlconf testapi testlimits testparser" |
9 | 9 | ||
10 | for T in $TESTS; do | 10 | for T in $TESTS; do |
11 | echo Running $T | 11 | echo Running $T |
diff --git a/meta/recipes-core/libxml/libxml2_2.13.8.bb b/meta/recipes-core/libxml/libxml2_2.14.3.bb index e82e0e8ec3..d5d144f793 100644 --- a/meta/recipes-core/libxml/libxml2_2.13.8.bb +++ b/meta/recipes-core/libxml/libxml2_2.14.3.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2" | |||
4 | BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" | 4 | BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" |
5 | SECTION = "libs" | 5 | SECTION = "libs" |
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \ | 7 | LIC_FILES_CHKSUM = "file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \ |
8 | file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ | 8 | file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \ |
9 | file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ | 9 | file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \ |
10 | " | 10 | " |
@@ -19,7 +19,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt | |||
19 | file://install-tests.patch \ | 19 | file://install-tests.patch \ |
20 | " | 20 | " |
21 | 21 | ||
22 | SRC_URI[archive.sha256sum] = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a" | 22 | SRC_URI[archive.sha256sum] = "6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833" |
23 | SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" | 23 | SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273" |
24 | 24 | ||
25 | # Disputed as a security issue, but fixed in d39f780 | 25 | # Disputed as a security issue, but fixed in d39f780 |
@@ -27,11 +27,8 @@ CVE_STATUS[CVE-2023-45322] = "disputed: issue requires memory allocation to fail | |||
27 | 27 | ||
28 | BINCONFIG = "${bindir}/xml2-config" | 28 | BINCONFIG = "${bindir}/xml2-config" |
29 | 29 | ||
30 | PACKAGECONFIG ??= "python \ | 30 | PACKAGECONFIG ??= "python" |
31 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | ||
32 | " | ||
33 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" | 31 | PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" |
34 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," | ||
35 | 32 | ||
36 | inherit autotools pkgconfig binconfig-disabled ptest | 33 | inherit autotools pkgconfig binconfig-disabled ptest |
37 | 34 | ||