From ff7c814661780ab95de219e21cf3e82051450e06 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 13 Jun 2016 05:16:32 -0400 Subject: libxml2: upgrade to 2.9.4 - Drop configure.ac-fix-cross-compiling-warning.patch, libxml2 2.9.4 has fixed it (From OE-Core rev: 323c7cec65603476994dde196f4c2c151d0e0d31) updated stable for these reasons: this includes the following security fixes: CVE-2016-1762 CVE-2016-3705 CVE-2016-1834 CVE-2016-4483 CVE-2016-1840 CVE-2016-1838 CVE-2016-1839 CVE-2016-1836 CVE-2016-4449 CVE-2016-1837 CVE-2016-1835 CVE-2016-1833 CVE-2016-3627 plus many bug fixes. see http://xmlsoft.org/news.html for details. (From OE-Core rev: 1576cb4ac24340cda504ee9807b465f8428138f0) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../configure.ac-fix-cross-compiling-warning.patch | 45 ------------- meta/recipes-core/libxml/libxml2_2.9.3.bb | 74 ---------------------- meta/recipes-core/libxml/libxml2_2.9.4.bb | 73 +++++++++++++++++++++ 3 files changed, 73 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch delete mode 100644 meta/recipes-core/libxml/libxml2_2.9.3.bb create mode 100644 meta/recipes-core/libxml/libxml2_2.9.4.bb diff --git a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch b/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch deleted file mode 100644 index 2f8079b052..0000000000 --- a/meta/recipes-core/libxml/libxml2/configure.ac-fix-cross-compiling-warning.patch +++ /dev/null @@ -1,45 +0,0 @@ -configure.ac: fix cross compiling warning - -There is a warning while cross compiling which triggered a -failure by do_qa_configure -... -|configure:12652: checking for gzread in -lz -|configure:12677: mips-poky-linux-gcc -meb -mabi=32 -mhard-float - -L/lib conftest.c -lz >&5 -|ld: warning: library search path "/lib" is unsafe for cross-compilation -... - -While do the lib checking, do not add '-L${Z_DIR}/lib' to LDFLAGS could fix it. - -Upstream-Status: Inappropriate [oe specific] -Signed-off-by: Hongxu Jia ---- - configure.ac | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9a90600..0bac8a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -391,8 +391,6 @@ if test "$with_zlib" = "no"; then - echo "Disabling compression support" - else - AC_CHECK_HEADERS(zlib.h, -- [SAVE_LDFLAGS="${LDFLAGS}" -- LDFLAGS="-L${Z_DIR}/lib" - AC_CHECK_LIB(z, gzread,[ - AC_DEFINE([HAVE_LIBZ], [1], [Have compression library]) - WITH_ZLIB=1 -@@ -406,8 +404,7 @@ else - esac] - else - Z_LIBS="-lz" -- fi]) -- LDFLAGS="${SAVE_LDFLAGS}"]) -+ fi])) - fi - - AC_SUBST(Z_CFLAGS) --- -1.9.1 - diff --git a/meta/recipes-core/libxml/libxml2_2.9.3.bb b/meta/recipes-core/libxml/libxml2_2.9.3.bb deleted file mode 100644 index 481346cdb6..0000000000 --- a/meta/recipes-core/libxml/libxml2_2.9.3.bb +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY = "XML C Parser Library and Toolkit" -DESCRIPTION = "The XML Parser Library allows for manipulation of XML files. Libxml2 exports Push and Pull type parser interfaces for both XML and HTML. It can do DTD validation at parse time, on a parsed document instance or with an arbitrary DTD. Libxml2 includes complete XPath, XPointer and Xinclude implementations. It also has a SAX like interface, which is designed to be compatible with Expat." -HOMEPAGE = "http://www.xmlsoft.org/" -BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ - file://hash.c;beginline=6;endline=15;md5=96f7296605eae807670fb08947829969 \ - file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ - file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e" - -DEPENDS = "zlib virtual/libiconv" - -SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ - http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ - file://libxml-64bit.patch \ - file://ansidecl.patch \ - file://runtest.patch \ - file://run-ptest \ - file://python-sitepackages-dir.patch \ - file://libxml-m4-use-pkgconfig.patch \ - file://configure.ac-fix-cross-compiling-warning.patch \ - " - -SRC_URI[libtar.md5sum] = "daece17e045f1c107610e137ab50c179" -SRC_URI[libtar.sha256sum] = "4de9e31f46b44d34871c22f54bfc54398ef124d6f7cafb1f4a5958fbcd3ba12d" -SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" -SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" - -BINCONFIG = "${bindir}/xml2-config" - -inherit autotools pkgconfig binconfig-disabled pythonnative ptest - -RDEPENDS_${PN}-ptest += "python-core" - -RDEPENDS_${PN}-python += "python-core" - -RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm1141" - -export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" - -PACKAGECONFIG ??= "python" -PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" - -# WARNING: zlib is require for RPM use -EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" -EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" -EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" -EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" - -# required for python binding -export HOST_SYS -export BUILD_SYS -export STAGING_LIBDIR -export STAGING_INCDIR - -python populate_packages_prepend () { - # autonamer would call this libxml2-2, but we don't want that - if d.getVar('DEBIAN_NAMES', True): - d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') -} - -PACKAGES += "${PN}-utils ${PN}-python" - -FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" -FILES_${PN}-utils += "${bindir}/*" -FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" - -do_install_ptest () { - cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/libxml/libxml2_2.9.4.bb b/meta/recipes-core/libxml/libxml2_2.9.4.bb new file mode 100644 index 0000000000..54231a5aa7 --- /dev/null +++ b/meta/recipes-core/libxml/libxml2_2.9.4.bb @@ -0,0 +1,73 @@ +SUMMARY = "XML C Parser Library and Toolkit" +DESCRIPTION = "The XML Parser Library allows for manipulation of XML files. Libxml2 exports Push and Pull type parser interfaces for both XML and HTML. It can do DTD validation at parse time, on a parsed document instance or with an arbitrary DTD. Libxml2 includes complete XPath, XPointer and Xinclude implementations. It also has a SAX like interface, which is designed to be compatible with Expat." +HOMEPAGE = "http://www.xmlsoft.org/" +BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://Copyright;md5=2044417e2e5006b65a8b9067b683fcf1 \ + file://hash.c;beginline=6;endline=15;md5=96f7296605eae807670fb08947829969 \ + file://list.c;beginline=4;endline=13;md5=cdbfa3dee51c099edb04e39f762ee907 \ + file://trio.c;beginline=5;endline=14;md5=6c025753c86d958722ec76e94cae932e" + +DEPENDS = "zlib virtual/libiconv" + +SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=libtar \ + http://www.w3.org/XML/Test/xmlts20080827.tar.gz;name=testtar \ + file://libxml-64bit.patch \ + file://ansidecl.patch \ + file://runtest.patch \ + file://run-ptest \ + file://python-sitepackages-dir.patch \ + file://libxml-m4-use-pkgconfig.patch \ + " + +SRC_URI[libtar.md5sum] = "ae249165c173b1ff386ee8ad676815f5" +SRC_URI[libtar.sha256sum] = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" +SRC_URI[testtar.md5sum] = "ae3d1ebe000a3972afa104ca7f0e1b4a" +SRC_URI[testtar.sha256sum] = "96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7" + +BINCONFIG = "${bindir}/xml2-config" + +inherit autotools pkgconfig binconfig-disabled pythonnative ptest + +RDEPENDS_${PN}-ptest += "python-core" + +RDEPENDS_${PN}-python += "python-core" + +RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-gconv-ebcdic-us glibc-gconv-ibm1141" + +export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}" + +PACKAGECONFIG ??= "python" +PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python" + +# WARNING: zlib is require for RPM use +EXTRA_OECONF = "--without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions" +EXTRA_OECONF_class-native = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" +EXTRA_OECONF_class-nativesdk = "--without-legacy --without-docbook --with-c14n --without-lzma --with-zlib" +EXTRA_OECONF_linuxstdbase = "--with-debug --with-legacy --with-docbook --with-c14n --without-lzma --with-zlib" + +# required for python binding +export HOST_SYS +export BUILD_SYS +export STAGING_LIBDIR +export STAGING_INCDIR + +python populate_packages_prepend () { + # autonamer would call this libxml2-2, but we don't want that + if d.getVar('DEBIAN_NAMES', True): + d.setVar('PKG_libxml2', '${MLPREFIX}libxml2') +} + +PACKAGES += "${PN}-utils ${PN}-python" + +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES_${PN}-dev += "${libdir}/xml2Conf.sh ${libdir}/cmake/*" +FILES_${PN}-utils += "${bindir}/*" +FILES_${PN}-python += "${PYTHON_SITEPACKAGES_DIR}" + +do_install_ptest () { + cp -r ${WORKDIR}/xmlconf ${D}${PTEST_PATH} +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf