libarchive: Upgrade to v3.2.0
All patches are removed as they are no longer needed. Most were merged into this release of libarchive. "0001-Set-xattrs-after-setting-times.patch" was dropped upstream after discussion, see https://github.com/libarchive/libarchive/pull/664. The COPYING file in libarchive had a couple of minor changes to clarify which files are under which copyrights but the overall license is unaffected. (From OE-Core rev: 4976382011106b9515e44359f2f6bb1d0c69fdb3) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Barker
Richard Purdie
parent
9d7867a054
commit
c6e5c00d40
|
|
@ -1,59 +0,0 @@
|
|||
From 545ded56095c570426fe102ff2192889681ea75c Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
|
||||
Date: Mon, 29 Feb 2016 14:38:25 +0200
|
||||
Subject: [PATCH] Set xattrs after setting times
|
||||
|
||||
With Integrity Measurement Architecture (IMA) enabled in Linux
|
||||
kernel the security.ima extended attribute gets overwritten
|
||||
when setting times on a file with a futimens() call. So it's safer
|
||||
to set xattrs after times.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/664]
|
||||
|
||||
Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
|
||||
|
||||
---
|
||||
libarchive/archive_write_disk_posix.c | 21 +++++++++++----------
|
||||
1 file changed, 11 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
|
||||
index 0fc6193..27c9c1e 100644
|
||||
--- a/libarchive/archive_write_disk_posix.c
|
||||
+++ b/libarchive/archive_write_disk_posix.c
|
||||
@@ -1620,16 +1620,6 @@ _archive_write_disk_finish_entry(struct archive *_a)
|
||||
}
|
||||
|
||||
/*
|
||||
- * Security-related extended attributes (such as
|
||||
- * security.capability on Linux) have to be restored last,
|
||||
- * since they're implicitly removed by other file changes.
|
||||
- */
|
||||
- if (a->todo & TODO_XATTR) {
|
||||
- int r2 = set_xattrs(a);
|
||||
- if (r2 < ret) ret = r2;
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
* Some flags prevent file modification; they must be restored after
|
||||
* file contents are written.
|
||||
*/
|
||||
@@ -1648,6 +1638,17 @@ _archive_write_disk_finish_entry(struct archive *_a)
|
||||
}
|
||||
|
||||
/*
|
||||
+ * Security-related extended attributes (such as
|
||||
+ * security.capability or security.ima on Linux) have to be restored last,
|
||||
+ * since they're implicitly removed by other file changes like setting
|
||||
+ * times.
|
||||
+ */
|
||||
+ if (a->todo & TODO_XATTR) {
|
||||
+ int r2 = set_xattrs(a);
|
||||
+ if (r2 < ret) ret = r2;
|
||||
+ }
|
||||
+
|
||||
+ /*
|
||||
* Mac extended metadata includes ACLs.
|
||||
*/
|
||||
if (a->todo & TODO_MAC_METADATA) {
|
||||
--
|
||||
2.5.0
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
From 2f55d6bd308ea61975558c2469ae349dba297e89 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Sat, 22 Feb 2014 14:35:59 +0800
|
||||
Subject: [PATCH] Fix CVE-2013-0211
|
||||
|
||||
This patch comes from:https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4
|
||||
|
||||
Upstream-Status: Backport
|
||||
CVE: CVE-2013-0211
|
||||
|
||||
Signed-off-by: Baogen shang <baogen.shang@windriver.com>
|
||||
|
||||
Update the patch because of uprev on 20140222
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
libarchive/archive_write.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
|
||||
index a3d1a33..a323588 100644
|
||||
--- a/libarchive/archive_write.c
|
||||
+++ b/libarchive/archive_write.c
|
||||
@@ -671,8 +671,12 @@ static ssize_t
|
||||
_archive_write_data(struct archive *_a, const void *buff, size_t s)
|
||||
{
|
||||
struct archive_write *a = (struct archive_write *)_a;
|
||||
+ const size_t max_write = INT_MAX;
|
||||
archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
|
||||
ARCHIVE_STATE_DATA, "archive_write_data");
|
||||
+ /* In particular, this catches attempts to pass negative values. */
|
||||
+ if (s > max_write)
|
||||
+ s = max_write;
|
||||
archive_clear_error(&a->archive);
|
||||
return ((a->format_write_data)(a, buff, s));
|
||||
}
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
From 59357157706d47c365b2227739e17daba3607526 Mon Sep 17 00:00:00 2001
|
||||
From: Alessandro Ghedini <alessandro@ghedini.me>
|
||||
Date: Sun, 1 Mar 2015 12:07:45 +0100
|
||||
Subject: [PATCH] Add ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS option
|
||||
|
||||
This fixes a directory traversal in the cpio tool.
|
||||
|
||||
|
||||
Upstream-Status: backport
|
||||
CVE: CVE-2015-2304
|
||||
|
||||
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
||||
---
|
||||
cpio/bsdcpio.1 | 3 ++-
|
||||
cpio/cpio.c | 2 ++
|
||||
libarchive/archive.h | 2 ++
|
||||
libarchive/archive_write_disk.3 | 3 +++
|
||||
libarchive/archive_write_disk_posix.c | 14 +++++++++++---
|
||||
libarchive/test/test_write_disk_secure.c | 23 +++++++++++++++++++++++
|
||||
6 files changed, 43 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/cpio/bsdcpio.1 b/cpio/bsdcpio.1
|
||||
index f966aa0..e52546e 100644
|
||||
--- a/cpio/bsdcpio.1
|
||||
+++ b/cpio/bsdcpio.1
|
||||
@@ -156,7 +156,8 @@ See above for description.
|
||||
.It Fl Fl insecure
|
||||
(i and p mode only)
|
||||
Disable security checks during extraction or copying.
|
||||
-This allows extraction via symbolic links and path names containing
|
||||
+This allows extraction via symbolic links, absolute paths,
|
||||
+and path names containing
|
||||
.Sq ..
|
||||
in the name.
|
||||
.It Fl J , Fl Fl xz
|
||||
diff --git a/cpio/cpio.c b/cpio/cpio.c
|
||||
index 0acde11..b267e9b 100644
|
||||
--- a/cpio/cpio.c
|
||||
+++ b/cpio/cpio.c
|
||||
@@ -171,6 +171,7 @@ main(int argc, char *argv[])
|
||||
cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
|
||||
cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
|
||||
cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
|
||||
+ cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
|
||||
cpio->extract_flags |= ARCHIVE_EXTRACT_PERM;
|
||||
cpio->extract_flags |= ARCHIVE_EXTRACT_FFLAGS;
|
||||
cpio->extract_flags |= ARCHIVE_EXTRACT_ACL;
|
||||
@@ -256,6 +257,7 @@ main(int argc, char *argv[])
|
||||
case OPTION_INSECURE:
|
||||
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_SYMLINKS;
|
||||
cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NODOTDOT;
|
||||
+ cpio->extract_flags &= ~ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS;
|
||||
break;
|
||||
case 'L': /* GNU cpio */
|
||||
cpio->option_follow_links = 1;
|
||||
diff --git a/libarchive/archive.h b/libarchive/archive.h
|
||||
index 1f0fc38..ef635ac 100644
|
||||
--- a/libarchive/archive.h
|
||||
+++ b/libarchive/archive.h
|
||||
@@ -649,6 +649,8 @@ __LA_DECL int archive_read_set_passphrase_callback(struct archive *,
|
||||
/* Default: Do not use HFS+ compression if it was not compressed. */
|
||||
/* This has no effect except on Mac OS v10.6 or later. */
|
||||
#define ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED (0x8000)
|
||||
+/* Default: Do not reject entries with absolute paths */
|
||||
+#define ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS (0x10000)
|
||||
|
||||
__LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
|
||||
int flags);
|
||||
diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3
|
||||
index fa925cc..a2e7afa 100644
|
||||
--- a/libarchive/archive_write_disk.3
|
||||
+++ b/libarchive/archive_write_disk.3
|
||||
@@ -177,6 +177,9 @@ The default is to not refuse such paths.
|
||||
Note that paths ending in
|
||||
.Pa ..
|
||||
always cause an error, regardless of this flag.
|
||||
+.It Cm ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
|
||||
+Refuse to extract an absolute path.
|
||||
+The default is to not refuse such paths.
|
||||
.It Cm ARCHIVE_EXTRACT_SPARSE
|
||||
Scan data for blocks of NUL bytes and try to recreate them with holes.
|
||||
This results in sparse files, independent of whether the archive format
|
||||
diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
|
||||
index ab3bdac..c1290eb 100644
|
||||
--- a/libarchive/archive_write_disk_posix.c
|
||||
+++ b/libarchive/archive_write_disk_posix.c
|
||||
@@ -2509,8 +2509,9 @@ cleanup_pathname_win(struct archive_write_disk *a)
|
||||
/*
|
||||
* Canonicalize the pathname. In particular, this strips duplicate
|
||||
* '/' characters, '.' elements, and trailing '/'. It also raises an
|
||||
- * error for an empty path, a trailing '..' or (if _SECURE_NODOTDOT is
|
||||
- * set) any '..' in the path.
|
||||
+ * error for an empty path, a trailing '..', (if _SECURE_NODOTDOT is
|
||||
+ * set) any '..' in the path or (if ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
|
||||
+ * is set) if the path is absolute.
|
||||
*/
|
||||
static int
|
||||
cleanup_pathname(struct archive_write_disk *a)
|
||||
@@ -2529,8 +2530,15 @@ cleanup_pathname(struct archive_write_disk *a)
|
||||
cleanup_pathname_win(a);
|
||||
#endif
|
||||
/* Skip leading '/'. */
|
||||
- if (*src == '/')
|
||||
+ if (*src == '/') {
|
||||
+ if (a->flags & ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS) {
|
||||
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
||||
+ "Path is absolute");
|
||||
+ return (ARCHIVE_FAILED);
|
||||
+ }
|
||||
+
|
||||
separator = *src++;
|
||||
+ }
|
||||
|
||||
/* Scan the pathname one element at a time. */
|
||||
for (;;) {
|
||||
diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c
|
||||
index 31c5bfd..2c94206 100644
|
||||
--- a/libarchive/test/test_write_disk_secure.c
|
||||
+++ b/libarchive/test/test_write_disk_secure.c
|
||||
@@ -178,6 +178,29 @@ DEFINE_TEST(test_write_disk_secure)
|
||||
assert(S_ISDIR(st.st_mode));
|
||||
archive_entry_free(ae);
|
||||
|
||||
+ /*
|
||||
+ * Without security checks, we should be able to
|
||||
+ * extract an absolute path.
|
||||
+ */
|
||||
+ assert((ae = archive_entry_new()) != NULL);
|
||||
+ archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
|
||||
+ archive_entry_set_mode(ae, S_IFREG | 0777);
|
||||
+ assert(0 == archive_write_header(a, ae));
|
||||
+ assert(0 == archive_write_finish_entry(a));
|
||||
+ assertFileExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
|
||||
+ assert(0 == unlink("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp"));
|
||||
+
|
||||
+ /* But with security checks enabled, this should fail. */
|
||||
+ assert(archive_entry_clear(ae) != NULL);
|
||||
+ archive_entry_copy_pathname(ae, "/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
|
||||
+ archive_entry_set_mode(ae, S_IFREG | 0777);
|
||||
+ archive_write_disk_set_options(a, ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS);
|
||||
+ failure("Extracting an absolute path should fail here.");
|
||||
+ assertEqualInt(ARCHIVE_FAILED, archive_write_header(a, ae));
|
||||
+ archive_entry_free(ae);
|
||||
+ assert(0 == archive_write_finish_entry(a));
|
||||
+ assertFileNotExists("/tmp/libarchive_test-test_write_disk_secure-absolute_path.tmp");
|
||||
+
|
||||
assertEqualInt(ARCHIVE_OK, archive_write_free(a));
|
||||
|
||||
/* Test the entries on disk. */
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
Add missing mkdir calls so that out-of-tree builds work.
|
||||
|
||||
Upstream-Status: Submitted (https://github.com/libarchive/libarchive/pull/534)
|
||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 3fa2d22..5ecca52 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -508,6 +508,7 @@ libarchive_test_LDADD= $(LTLIBICONV)
|
||||
# Building it automatically provides a sanity-check on libarchive_test_SOURCES
|
||||
# above.
|
||||
libarchive/test/list.h: Makefile
|
||||
+ $(MKDIR_P) libarchive/test
|
||||
cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h
|
||||
|
||||
libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG
|
||||
@@ -835,6 +836,7 @@ bsdtar_test_CPPFLAGS=\
|
||||
$(PLATFORMCPPFLAGS)
|
||||
|
||||
tar/test/list.h: Makefile
|
||||
+ $(MKDIR_P) tar/test
|
||||
cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h
|
||||
|
||||
if BUILD_BSDTAR
|
||||
@@ -975,6 +977,7 @@ bsdcpio_test_CPPFLAGS= \
|
||||
bsdcpio_test_LDADD=libarchive_fe.la
|
||||
|
||||
cpio/test/list.h: Makefile
|
||||
+ $(MKDIR_P) cpio/test
|
||||
cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h
|
||||
|
||||
if BUILD_BSDCPIO
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 38bd299..7bdb00c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -102,6 +102,7 @@ AC_USE_SYSTEM_EXTENSIONS
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
AC_PROG_LIBTOOL
|
||||
AC_CHECK_TOOL([STRIP],[strip])
|
||||
+AC_PROG_MKDIR_P
|
||||
|
||||
#
|
||||
# Options for building bsdtar.
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
Use pkg-config for the libxml2 dependency, not the -config script.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
RP 2014/5/22
|
||||
|
||||
Index: libarchive-3.1.2/configure.ac
|
||||
===================================================================
|
||||
--- libarchive-3.1.2.orig/configure.ac 2013-02-09 17:23:03.000000000 +0000
|
||||
+++ libarchive-3.1.2/configure.ac 2014-05-13 15:26:45.446499108 +0000
|
||||
@@ -329,10 +329,10 @@
|
||||
AS_HELP_STRING([--without-expat], [Don't build support for xar through expat]))
|
||||
|
||||
if test "x$with_xml2" != "xno"; then
|
||||
- AC_PATH_PROG([XML2_CONFIG], [xml2-config],, [${PATH}])
|
||||
- if test "x$XML2_CONFIG" != "x"; then
|
||||
- CPPFLAGS="${CPPFLAGS} `${XML2_CONFIG} --cflags`"
|
||||
- LIBS="${LIBS} `${XML2_CONFIG} --libs`"
|
||||
+ PKG_CHECK_MODULES(PKG_XML2, [libxml-2.0],,)
|
||||
+ if test "x$PKG_XML2_CFLAGS" != "x"; then
|
||||
+ CPPFLAGS="${CPPFLAGS} ${PKG_XML2_CFLAGS}"
|
||||
+ LIBS="${LIBS} ${PKG_XML2_LIBS}"
|
||||
AC_CHECK_LIB(xml2,xmlInitParser,[true],AC_MSG_FAILURE(Missing xml2 library))
|
||||
else
|
||||
AC_CHECK_LIB(xml2,xmlInitParser)
|
||||
|
|
@ -3,7 +3,7 @@ DESCRIPTION = "C library and command-line tools for reading and writing tar, cpi
|
|||
HOMEPAGE = "http://www.libarchive.org/"
|
||||
SECTION = "devel"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b4e3ffd607d6686c6cb2f63394370841"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ed99aca006bc346974bb745a35336425"
|
||||
|
||||
DEPENDS = "e2fsprogs-native"
|
||||
|
||||
|
|
@ -31,15 +31,10 @@ PACKAGECONFIG[lzo] = "--with-lzo2,--without-lzo2,lzo,"
|
|||
PACKAGECONFIG[nettle] = "--with-nettle,--without-nettle,nettle,"
|
||||
|
||||
SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
|
||||
file://libarchive-CVE-2013-0211.patch \
|
||||
file://pkgconfig.patch \
|
||||
file://libarchive-CVE-2015-2304.patch \
|
||||
file://mkdir.patch \
|
||||
file://0001-Set-xattrs-after-setting-times.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "efad5a503f66329bb9d2f4308b5de98a"
|
||||
SRC_URI[sha256sum] = "eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e"
|
||||
SRC_URI[md5sum] = "596210b5a9c2ff74a0f7ca34838d655f"
|
||||
SRC_URI[sha256sum] = "7bce45fd71ff01dc20d19edd78322d4965583d81b8bed8e26cacb65d6f5baa87"
|
||||
|
||||
inherit autotools update-alternatives pkgconfig
|
||||
|
||||
Loading…
Reference in New Issue