diff options
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive')
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch | 38 | ||||
-rw-r--r-- | meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | 25 |
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch b/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch new file mode 100644 index 0000000000..126f80e044 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/libarchive-CVE-2013-0211.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From 2f55d6bd308ea61975558c2469ae349dba297e89 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Sat, 22 Feb 2014 14:35:59 +0800 | ||
4 | Subject: [PATCH] Fix CVE-2013-0211 | ||
5 | |||
6 | This patch comes from:https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4 | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Baogen shang <baogen.shang@windriver.com> | ||
11 | |||
12 | Update the patch because of uprev on 20140222 | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | libarchive/archive_write.c | 4 ++++ | ||
17 | 1 file changed, 4 insertions(+) | ||
18 | |||
19 | diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c | ||
20 | index a3d1a33..a323588 100644 | ||
21 | --- a/libarchive/archive_write.c | ||
22 | +++ b/libarchive/archive_write.c | ||
23 | @@ -671,8 +671,12 @@ static ssize_t | ||
24 | _archive_write_data(struct archive *_a, const void *buff, size_t s) | ||
25 | { | ||
26 | struct archive_write *a = (struct archive_write *)_a; | ||
27 | + const size_t max_write = INT_MAX; | ||
28 | archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, | ||
29 | ARCHIVE_STATE_DATA, "archive_write_data"); | ||
30 | + /* In particular, this catches attempts to pass negative values. */ | ||
31 | + if (s > max_write) | ||
32 | + s = max_write; | ||
33 | archive_clear_error(&a->archive); | ||
34 | return ((a->format_write_data)(a, buff, s)); | ||
35 | } | ||
36 | -- | ||
37 | 1.8.2.1 | ||
38 | |||
diff --git a/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch b/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch new file mode 100644 index 0000000000..346af91351 --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/pkgconfig.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Use pkg-config for the libxml2 dependency, not the -config script. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | RP 2014/5/22 | ||
6 | |||
7 | Index: libarchive-3.1.2/configure.ac | ||
8 | =================================================================== | ||
9 | --- libarchive-3.1.2.orig/configure.ac 2013-02-09 17:23:03.000000000 +0000 | ||
10 | +++ libarchive-3.1.2/configure.ac 2014-05-13 15:26:45.446499108 +0000 | ||
11 | @@ -329,10 +329,10 @@ | ||
12 | AS_HELP_STRING([--without-expat], [Don't build support for xar through expat])) | ||
13 | |||
14 | if test "x$with_xml2" != "xno"; then | ||
15 | - AC_PATH_PROG([XML2_CONFIG], [xml2-config],, [${PATH}]) | ||
16 | - if test "x$XML2_CONFIG" != "x"; then | ||
17 | - CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`" | ||
18 | - LIBS="${LIBS} `${XML2_CONFIG} --libs`" | ||
19 | + PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,) | ||
20 | + if test "x$PKG_XML2_CFLAGS" != "x"; then | ||
21 | + CPPFLAGS="${CPPFLAGS} ${PKG_XML2_CFLAGS}" | ||
22 | + LIBS="${LIBS} ${PKG_XML2_LIBS}" | ||
23 | AC_CHECK_LIB(xml2,xmlInitParser,[true],AC_MSG_FAILURE(Missing xml2 library)) | ||
24 | else | ||
25 | AC_CHECK_LIB(xml2,xmlInitParser) | ||