diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-06-22 23:01:06 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-07 15:58:19 +0000 |
commit | e416fb692080ec13b1ff0c7d8e6d88d0db73be2d (patch) | |
tree | 933c4da632ac571304850f208055758a7cb18261 /meta/recipes-core/libxml/libxml2 | |
parent | aa66dc91d3db7b1b800330fbda3dce27ee270214 (diff) | |
download | poky-e416fb692080ec13b1ff0c7d8e6d88d0db73be2d.tar.gz |
libxml2: Update to 2.8.0
removed 2 patches that are now fixed upstream
updated hash.c LIC_FILES_CHKSUM due to updating the date to 2012
(From OE-Core rev: c74ed920d3a9a0e379f8fd450e2841628ee0beb2)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Resolved merge conflicts in denzil branch.
Addresses CVE-2011-1944.
Fixes denzil [YOCTO #2703]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/libxml/libxml2')
-rw-r--r-- | meta/recipes-core/libxml/libxml2/fix_version_info.patch | 23 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch | 23 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-core/libxml/libxml2/fix_version_info.patch b/meta/recipes-core/libxml/libxml2/fix_version_info.patch deleted file mode 100644 index 77113ef454..0000000000 --- a/meta/recipes-core/libxml/libxml2/fix_version_info.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Upstream-Status: Already upstream | ||
2 | |||
3 | From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 | ||
4 | From: Daniel Veillard <veillard@redhat.com> | ||
5 | Date: Thu, 04 Nov 2010 20:53:14 +0000 | ||
6 | Subject: Reactivate the shared library versionning script | ||
7 | |||
8 | --- | ||
9 | diff --git a/configure.in b/configure.in | ||
10 | index 59d0629..a1d2c89 100644 | ||
11 | --- a/configure.in | ||
12 | +++ b/configure.in | ||
13 | @@ -84,7 +84,7 @@ else | ||
14 | esac | ||
15 | fi | ||
16 | AC_SUBST(VERSION_SCRIPT_FLAGS) | ||
17 | -AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) | ||
18 | +AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) | ||
19 | |||
20 | dnl | ||
21 | dnl We process the AC_ARG_WITH first so that later we can modify | ||
22 | -- | ||
23 | cgit v0.9.0.2 | ||
diff --git a/meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch b/meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch deleted file mode 100644 index 5c25882fab..0000000000 --- a/meta/recipes-core/libxml/libxml2/libxml2_fix_for_automake_1.12.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has decpricated automatic de-ANSI-fication support | ||
4 | |||
5 | this patch fixes this build issue: | ||
6 | |||
7 | | configure.in:67: error: automatic de-ANSI-fication support has been removed | ||
8 | Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
9 | 2012/05/02 | ||
10 | |||
11 | Index: libxml2-2.7.8/configure.in | ||
12 | =================================================================== | ||
13 | --- libxml2-2.7.8.orig/configure.in | ||
14 | +++ libxml2-2.7.8/configure.in | ||
15 | @@ -63,8 +63,6 @@ AC_PATH_PROG(WGET, wget, /usr/bin/wget) | ||
16 | AC_PATH_PROG(XMLLINT, xmllint, /usr/bin/xmllint) | ||
17 | AC_PATH_PROG(XSLTPROC, xsltproc, /usr/bin/xsltproc) | ||
18 | |||
19 | -dnl Make sure we have an ANSI compiler | ||
20 | -AM_C_PROTOTYPES | ||
21 | test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant) | ||
22 | |||
23 | AC_LIBTOOL_WIN32_DLL | ||