Merge from bittboy/buildroot@db180c0

package/cpio/0001-fix-CVE-2016-2037.patch

@@ -0,0 +1,51 @@
+From: Pavel Raiskup
+Subject: [Bug-cpio] [PATCH] fix 1-byte out-of-bounds write
+Date: Tue, 26 Jan 2016 23:17:54 +0100
+
+Other calls to cpio_safer_name_suffix seem to be safe.
+
+* src/copyin.c (process_copy_in):  Make sure that file_hdr.c_name
+has at least two bytes allocated.
+* src/util.c (cpio_safer_name_suffix): Document that use of this
+function requires to be careful.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+Patch status: fetched/submitted
+URL: https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html
+
+ src/copyin.c | 2 ++
+ src/util.c   | 5 ++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/copyin.c b/src/copyin.c
+index cde911e..032d35f 100644
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -1385,6 +1385,8 @@ process_copy_in ()
+          break;
+        }
+
++      if (file_hdr.c_namesize <= 1)
++        file_hdr.c_name = xrealloc(file_hdr.c_name, 2);
+       cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
+                              false);
+
+diff --git a/src/util.c b/src/util.c
+index 6ff6032..2763ac1 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -1411,7 +1411,10 @@ set_file_times (int fd,
+ }
+ 
+ /* Do we have to ignore absolute paths, and if so, does the filename
+-   have an absolute path?  */
++   have an absolute path?
++   Before calling this function make sure that the allocated NAME buffer has
++   capacity at least 2 bytes to allow us to store the "." string inside.  */
++
+ void
+ cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names,
+                        bool strip_leading_dots)
+--
+2.5.0

package/cpio/Config.in

@@ -0,0 +1,12 @@
+config BR2_PACKAGE_CPIO
+	bool "cpio"
+	depends on BR2_USE_WCHAR
+	# Need argp.h support
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
+	help
+	  cpio archive utility for creation and extraction.
+
+	  https://www.gnu.org/software/cpio/
+
+comment "cpio needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR

package/cpio/cpio.hash

@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature
+sha256	08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73	cpio-2.12.tar.gz

package/cpio/cpio.mk

@@ -0,0 +1,20 @@
+################################################################################
+#
+# cpio
+#
+################################################################################
+
+CPIO_VERSION = 2.12
+CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
+CPIO_CONF_OPTS = --bindir=/bin
+CPIO_LICENSE = GPL-3.0+
+CPIO_LICENSE_FILES = COPYING
+
+# cpio uses argp.h which is not provided by uclibc or musl by default.
+# Use the argp-standalone package to provide this.
+ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
+CPIO_DEPENDENCIES += argp-standalone
+endif
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))