mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

libxslt: update to 1.1.29

Browse Source 
Drop upstreamed CVE-2015-7995.patch
Rebase pkgconfig.patch

(From OE-Core rev: f83217590d3157c1db502ddb27b94fe1c704185b)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2016-06-03 12:14:59 +03:00
committed by Richard Purdie
parent eddd0ec9ee
commit 9b937870cb
3 changed files with 31 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/libxslt/libxslt/pkgconfig.patch → meta/recipes-support/libxslt/libxslt/0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch
+27 -15
View File
@@ -1,14 +1,22 @@
Use pkg-config to find gcrypt and libxml2.
From ed71ac9548a2bb6ecd2dc5ad880c604975f872b0 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 2 Jun 2016 14:20:04 +0300
Subject: [PATCH] Use pkg-config to find gcrypt and libxml2.
Upstream-Status: Pending [libxml2 is upstreamable]
RP 2014/5/22
Index: libxslt-1.1.28/configure.in
===================================================================
--- libxslt-1.1.28.orig/configure.in 2014-05-13 16:46:02.278474967 +0000
+++ libxslt-1.1.28/configure.in 2014-05-13 16:53:56.510472561 +0000
@@ -376,6 +376,8 @@
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
configure.in | 70 +++++++++++-------------------------------------------------
1 file changed, 12 insertions(+), 58 deletions(-)
diff --git a/configure.in b/configure.in
index 8bdf45a..0b2b312 100644
--- a/configure.in
+++ b/configure.in
@@ -377,6 +377,8 @@ AC_SUBST(pythondir)
AC_SUBST(PYTHON_SUBDIR)
AC_SUBST(PYTHON_LIBS)
@@ -16,12 +24,12 @@ Index: libxslt-1.1.28/configure.in
+
AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)])
WITH_CRYPTO=0
if test "$with_crypto" = "no" ; then
@@ -391,26 +393,13 @@
WITH_CRYPTO=1
CRYPTO_TESTDIR=
@@ -394,27 +396,14 @@ case $host in
CRYPTO_TESTDIR=crypto
;;
*)
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
- AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
- if test "$LIBGCRYPT_CONFIG" != "no" ; then
- LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
- if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
@@ -37,20 +45,21 @@ Index: libxslt-1.1.28/configure.in
+ PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= 1.1.42], [
+ AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
+ echo 'Crypto extensions will be available.'
WITH_CRYPTO=1
WITH_CRYPTO=1
CRYPTO_TESTDIR=crypto
- fi
- else
- LIBGCRYPT_CFLAGS=""
- LIBGCRYPT_LIBS=""
- echo 'Crypto extensions will not be available. Install libgcrypt and reconfigure to make available.'
- fi
+ ], [
+ ], [
+ echo 'Crypto extensions will not be available. Install libgcrypt >= 1.1.42 and reconfigure to make available.'
+ ])
esac
fi
AC_SUBST(WITH_CRYPTO)
@@ -471,24 +460,8 @@
@@ -476,24 +465,8 @@ dnl original work - Mathieu Lacage 30/03/2000
dnl some tweaking - David Härdeman 30/10/2001
dnl
@@ -75,7 +84,7 @@ Index: libxslt-1.1.28/configure.in
AC_ARG_WITH(libxml-src,
[ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)],
LIBXML_SRC="$withval"
@@ -551,28 +524,9 @@
@@ -556,28 +529,9 @@ then
fi
fi
@@ -107,7 +116,7 @@ Index: libxslt-1.1.28/configure.in
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
@@ -597,7 +551,7 @@
@@ -602,7 +556,7 @@ fi
if test "$with_plugins" = "yes" ; then
AC_MSG_CHECKING([libxml2 module support])
@@ -116,3 +125,6 @@ Index: libxslt-1.1.28/configure.in
if test "${WITH_MODULES}" = "1"; then
AC_MSG_RESULT(yes)
else
--
2.8.1
meta/recipes-support/libxslt/libxslt/CVE-2015-7995.patch
-34
View File
@@ -1,34 +0,0 @@
From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 29 Oct 2015 19:33:23 +0800
Subject: Fix for type confusion in preprocessing attributes
CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
We need to check that the parent node is an element before dereferencing
its namespace
Upstream-Status: Backport
CVE: CVE-2015-7995
https://git.gnome.org/browse/libxslt/commit/?id=7ca19df892ca22d9314e95d59ce2abdeff46b617
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
libxslt/preproc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: libxslt-1.1.28/libxslt/preproc.c
===================================================================
--- libxslt-1.1.28.orig/libxslt/preproc.c
+++ libxslt-1.1.28/libxslt/preproc.c
@@ -2245,7 +2245,8 @@ xsltStylePreCompute(xsltStylesheetPtr st
} else if (IS_XSLT_NAME(inst, "attribute")) {
xmlNodePtr parent = inst->parent;
- if ((parent == NULL) || (parent->ns == NULL) ||
+ if ((parent == NULL) ||
+ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
((parent->ns != inst->ns) &&
(!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
(!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
meta/recipes-support/libxslt/libxslt_1.1.28.bb → meta/recipes-support/libxslt/libxslt_1.1.29.bb
+4 -4
View File
@@ -10,11 +10,11 @@ DEPENDS = "libxml2"
SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz \
file://pkgconfig_fix.patch \
file://pkgconfig.patch \
file://CVE-2015-7995.patch"
file://0001-Use-pkg-config-to-find-gcrypt-and-libxml2.patch \
"
SRC_URI[md5sum] = "9667bf6f9310b957254fdcf6596600b7"
SRC_URI[sha256sum] = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"
SRC_URI[md5sum] = "a129d3c44c022de3b9dcf6d6f288d72e"
SRC_URI[sha256sum] = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"
UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar"