update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Sonnenberger <joerg@bec.de>
|
||||
Date: Tue, 5 Sep 2017 18:12:19 +0200
|
||||
Subject: [PATCH] Do something sensible for empty strings to make fuzzers
|
||||
happy.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit fa7438a0ff
|
||||
|
||||
libarchive/archive_read_support_format_xar.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
|
||||
index 7a22beb9d8e4..93eeacc5e6eb 100644
|
||||
--- a/libarchive/archive_read_support_format_xar.c
|
||||
+++ b/libarchive/archive_read_support_format_xar.c
|
||||
@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
|
||||
uint64_t l;
|
||||
int digit;
|
||||
|
||||
+ if (char_cnt == 0)
|
||||
+ return (0);
|
||||
+
|
||||
l = 0;
|
||||
digit = *p - '0';
|
||||
while (digit >= 0 && digit < 10 && char_cnt-- > 0) {
|
||||
@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
|
||||
{
|
||||
int64_t l;
|
||||
int digit;
|
||||
-
|
||||
+
|
||||
+ if (char_cnt == 0)
|
||||
+ return (0);
|
||||
+
|
||||
l = 0;
|
||||
while (char_cnt-- > 0) {
|
||||
if (*p >= '0' && *p <= '7')
|
||||
--
|
||||
2.14.1
|
||||
|
||||
33
bsp/buildroot-2017.02.11/package/libarchive/Config.in
Normal file
33
bsp/buildroot-2017.02.11/package/libarchive/Config.in
Normal file
@@ -0,0 +1,33 @@
|
||||
comment "libarchive needs a toolchain w/ wchar"
|
||||
depends on !BR2_USE_WCHAR
|
||||
|
||||
config BR2_PACKAGE_LIBARCHIVE
|
||||
bool "libarchive"
|
||||
depends on BR2_USE_WCHAR
|
||||
help
|
||||
Libarchive is a reusable C library for reading and writing a
|
||||
variety of streaming archive formats.
|
||||
|
||||
http://www.libarchive.org/
|
||||
|
||||
if BR2_PACKAGE_LIBARCHIVE
|
||||
|
||||
config BR2_PACKAGE_LIBARCHIVE_BSDTAR
|
||||
bool "bsdtar"
|
||||
help
|
||||
The 'bsdtar' program is a full-featured 'tar'
|
||||
replacement built on libarchive.
|
||||
|
||||
config BR2_PACKAGE_LIBARCHIVE_BSDCPIO
|
||||
bool "bsdcpio"
|
||||
help
|
||||
The 'bsdcpio' program is a different interface to
|
||||
essentially the same functionality as 'bsdtar'.
|
||||
|
||||
config BR2_PACKAGE_LIBARCHIVE_BSDCAT
|
||||
bool "bsdcat"
|
||||
help
|
||||
The 'bsdcat' program is a simple replacement tool
|
||||
for zcat, bzcat, xzcat, and such.
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce libarchive-3.3.2.tar.gz
|
||||
131
bsp/buildroot-2017.02.11/package/libarchive/libarchive.mk
Normal file
131
bsp/buildroot-2017.02.11/package/libarchive/libarchive.mk
Normal file
@@ -0,0 +1,131 @@
|
||||
################################################################################
|
||||
#
|
||||
# libarchive
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBARCHIVE_VERSION = 3.3.2
|
||||
LIBARCHIVE_SITE = http://www.libarchive.org/downloads
|
||||
LIBARCHIVE_INSTALL_STAGING = YES
|
||||
LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
|
||||
LIBARCHIVE_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --enable-bsdtar=shared
|
||||
endif
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-bsdtar
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),y)
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=static
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=shared
|
||||
endif
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-bsdcpio
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDCAT),y)
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LIBARCHIVE_CONF_OPTS += --enable-bsdcat=static
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --enable-bsdcat=shared
|
||||
endif
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-bsdcat
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ACL),y)
|
||||
LIBARCHIVE_DEPENDENCIES += acl
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-acl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ATTR),y)
|
||||
LIBARCHIVE_DEPENDENCIES += attr
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-xattr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
LIBARCHIVE_CONF_OPTS += --with-bz2lib
|
||||
LIBARCHIVE_DEPENDENCIES += bzip2
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-bz2lib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT),y)
|
||||
LIBARCHIVE_DEPENDENCIES += expat
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-expat
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
LIBARCHIVE_DEPENDENCIES += libiconv
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
LIBARCHIVE_DEPENDENCIES += libxml2
|
||||
LIBARCHIVE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-xml2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LZO),y)
|
||||
LIBARCHIVE_DEPENDENCIES += lzo
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-lzo2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETTLE),y)
|
||||
LIBARCHIVE_DEPENDENCIES += nettle
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-nettle
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBARCHIVE_DEPENDENCIES += openssl
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LIBARCHIVE_DEPENDENCIES += zlib
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
# libarchive requires LZMA with thread support in the toolchain
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_PACKAGE_XZ),yy)
|
||||
LIBARCHIVE_DEPENDENCIES += xz
|
||||
LIBARCHIVE_CONF_OPTS += --with-lzma
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
# The only user of host-libarchive needs zlib support
|
||||
HOST_LIBARCHIVE_DEPENDENCIES = host-zlib
|
||||
HOST_LIBARCHIVE_CONF_OPTS = \
|
||||
--disable-bsdtar \
|
||||
--disable-bsdcpio \
|
||||
--disable-bsdcat \
|
||||
--disable-acl \
|
||||
--disable-xattr \
|
||||
--without-bz2lib \
|
||||
--without-expat \
|
||||
--without-libiconv-prefix \
|
||||
--without-xml2 \
|
||||
--without-lzo2 \
|
||||
--without-nettle \
|
||||
--without-openssl \
|
||||
--without-lzma
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user