From f13f3b2f20d5a4d14c084a7965034570bdc56319 Mon Sep 17 00:00:00 2001 From: Li xin Date: Mon, 17 Aug 2015 13:25:22 +0800 Subject: python-lxml: upgrade 3.2.5 -> 3.4.4 * Dropped backported python-lxml-3.2.5-fix-CVE-2014-3146.patch * Modify DISTUTILS_INSTALL_ARGS to avoid errors in the step of do_install | ValueError: invalid literal for int() with base 10: '--should-not-have-used-/usr/bin/xml2-config' | ERROR: python setup.py install execution failed. Signed-off-by: Li Xin Signed-off-by: Martin Jansa --- .../python-lxml-3.2.5-fix-CVE-2014-3146.patch | 91 ---------------------- .../recipes-devtools/python/python-lxml_3.2.5.bb | 35 --------- .../recipes-devtools/python/python-lxml_3.4.4.bb | 34 ++++++++ 3 files changed, 34 insertions(+), 126 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python-lxml/python-lxml-3.2.5-fix-CVE-2014-3146.patch delete mode 100644 meta-python/recipes-devtools/python/python-lxml_3.2.5.bb create mode 100644 meta-python/recipes-devtools/python/python-lxml_3.4.4.bb diff --git a/meta-python/recipes-devtools/python/python-lxml/python-lxml-3.2.5-fix-CVE-2014-3146.patch b/meta-python/recipes-devtools/python/python-lxml/python-lxml-3.2.5-fix-CVE-2014-3146.patch deleted file mode 100644 index 0a8e211bd3..0000000000 --- a/meta-python/recipes-devtools/python/python-lxml/python-lxml-3.2.5-fix-CVE-2014-3146.patch +++ /dev/null @@ -1,91 +0,0 @@ -Upstream-status:Backport - ---- a/src/lxml/html/clean.py -+++ b/src/lxml/html/clean.py -@@ -70,9 +70,10 @@ _css_import_re = re.compile( - - # All kinds of schemes besides just javascript: that can cause - # execution: --_javascript_scheme_re = re.compile( -- r'\s*(?:javascript|jscript|livescript|vbscript|data|about|mocha):', re.I) --_substitute_whitespace = re.compile(r'\s+').sub -+_is_javascript_scheme = re.compile( -+ r'(?:javascript|jscript|livescript|vbscript|data|about|mocha):', -+ re.I).search -+_substitute_whitespace = re.compile(r'[\s\x00-\x08\x0B\x0C\x0E-\x19]+').sub - # FIXME: should data: be blocked? - - # FIXME: check against: http://msdn2.microsoft.com/en-us/library/ms537512.aspx -@@ -467,7 +468,7 @@ class Cleaner(object): - def _remove_javascript_link(self, link): - # links like "j a v a s c r i p t:" might be interpreted in IE - new = _substitute_whitespace('', link) -- if _javascript_scheme_re.search(new): -+ if _is_javascript_scheme(new): - # FIXME: should this be None to delete? - return '' - return link ---- a/src/lxml/html/tests/test_clean.txt -+++ b/src/lxml/html/tests/test_clean.txt -@@ -1,3 +1,4 @@ -+>>> import re - >>> from lxml.html import fromstring, tostring - >>> from lxml.html.clean import clean, clean_html, Cleaner - >>> from lxml.html import usedoctest -@@ -17,6 +18,7 @@ - ... - ... - ... a link -+... a control char link - ... data - ... another link - ...

a paragraph

-@@ -33,7 +35,7 @@ - ... - ... ''' - -->>> print(doc) -+>>> print(re.sub('[\x00-\x07\x0E]', '', doc)) - - - -@@ -49,6 +51,7 @@ - - - a link -+ a control char link - data - another link -

a paragraph

-@@ -81,6 +84,7 @@ - - - a link -+ a control char link - data - another link -

a paragraph

-@@ -104,6 +108,7 @@ - - - a link -+ a control char link - data - another link -

a paragraph

-@@ -123,6 +128,7 @@ - - - a link -+ a control char link - data - another link -

a paragraph

-@@ -146,6 +152,7 @@ - - - a link -+ a control char link - data - another link -

a paragraph

diff --git a/meta-python/recipes-devtools/python/python-lxml_3.2.5.bb b/meta-python/recipes-devtools/python/python-lxml_3.2.5.bb deleted file mode 100644 index 68e36771fe..0000000000 --- a/meta-python/recipes-devtools/python/python-lxml_3.2.5.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Python XML bindings for libxml2 and libxslt" -DESCRIPTION = "Powerful and Pythonic XML processing library combining \ -libxml2/libxslt with the ElementTree API." -HOMEPAGE = "http://codespeak.net/lxml" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=f9f1dc24f720c143c2240df41fe5073b" -SRCNAME = "lxml" - -DEPENDS = "libxml2 libxslt" - -SRC_URI = "http://pypi.python.org/packages/source/l/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ - file://python-lxml-3.2.5-fix-CVE-2014-3146.patch " - -SRC_URI[md5sum] = "6c4fb9b1840631cff09b8229a12a9ef7" -SRC_URI[sha256sum] = "2bf072808a6546d0e56bf1ad3b98a43cca828724360d7419fad135141bd31f7e" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -inherit setuptools - -DISTUTILS_BUILD_ARGS += " \ - --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ - --with-xml2-config='${STAGING_BINDIR_CROSS}/pkg-config libxml2' \ -" - -DISTUTILS_INSTALL_ARGS += " \ - --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ - --with-xml2-config='${STAGING_BINDIR_CROSS}/xml2-config' \ -" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS_${PN} += "libxml2 libxslt python-compression" -RDEPENDS_${PN}_virtclass-native = "libxml2-native libxslt-native" - diff --git a/meta-python/recipes-devtools/python/python-lxml_3.4.4.bb b/meta-python/recipes-devtools/python/python-lxml_3.4.4.bb new file mode 100644 index 0000000000..2480e4df90 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-lxml_3.4.4.bb @@ -0,0 +1,34 @@ +SUMMARY = "Python XML bindings for libxml2 and libxslt" +DESCRIPTION = "Powerful and Pythonic XML processing library combining \ +libxml2/libxslt with the ElementTree API." +HOMEPAGE = "http://codespeak.net/lxml" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=f9f1dc24f720c143c2240df41fe5073b" +SRCNAME = "lxml" + +DEPENDS = "libxml2 libxslt" + +SRC_URI = "http://pypi.python.org/packages/source/l/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" + +SRC_URI[md5sum] = "a9a65972afc173ec7a39c585f4eea69c" +SRC_URI[sha256sum] = "b3d362bac471172747cda3513238f115cbd6c5f8b8e6319bf6a97a7892724099" + +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +DISTUTILS_BUILD_ARGS += " \ + --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ + --with-xml2-config='${STAGING_BINDIR_CROSS}/pkg-config libxml2' \ +" + +DISTUTILS_INSTALL_ARGS += " \ + --with-xslt-config='${STAGING_BINDIR_NATIVE}/pkg-config libxslt' \ + --with-xml2-config='${STAGING_BINDIR_CROSS}/pkg-config libxml2' \ +" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS_${PN} += "libxml2 libxslt python-compression" +RDEPENDS_${PN}_virtclass-native = "libxml2-native libxslt-native" + -- cgit v1.2.3-54-g00ecf