rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
bsp/buildroot/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch Normal file
View File

@@ -0,0 +1,69 @@
From b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 6 Jan 2018 23:32:52 +0100
Subject: [PATCH] add additional uapi guards for Linux kernel header files
With Linux kernel 4.16 it will be possible to guard more parts of the
Linux header files from a libc. Make use of this in musl to guard all
the structures and other definitions from the Linux header files which
are also defined by the header files provided by musl. This will make
it possible to compile source files which include both the libc
headers and the kernel userspace headers.
This extends the definitions done in commit 04983f227238 ("make
netinet/in.h suppress clashing definitions from kernel headers")
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Patch status: upstream commit b583c5d3b4cc
include/net/if.h | 7 +++++++
include/netinet/if_ether.h | 1 +
include/sys/xattr.h | 2 ++
3 files changed, 10 insertions(+)
diff --git a/include/net/if.h b/include/net/if.h
index 2f2fcc10e484..774cbff0b506 100644
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -125,6 +125,13 @@ struct ifconf {
#define ifc_req ifc_ifcu.ifcu_req
#define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
+#define __UAPI_DEF_IF_IFCONF 0
+#define __UAPI_DEF_IF_IFMAP 0
+#define __UAPI_DEF_IF_IFNAMSIZ 0
+#define __UAPI_DEF_IF_IFREQ 0
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
+
#endif
#ifdef __cplusplus
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
index d9a131aa2d1d..97134d75b480 100644
--- a/include/netinet/if_ether.h
+++ b/include/netinet/if_ether.h
@@ -133,5 +133,6 @@ do { \
(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
} while(0)
+#define __UAPI_DEF_ETHHDR 0
#endif
diff --git a/include/sys/xattr.h b/include/sys/xattr.h
index 6479fcc62e5f..eeeaafc44f09 100644
--- a/include/sys/xattr.h
+++ b/include/sys/xattr.h
@@ -24,6 +24,8 @@ int removexattr(const char *, const char *);
int lremovexattr(const char *, const char *);
int fremovexattr(int, const char *);
+#define __UAPI_DEF_XATTR 0
+
#ifdef __cplusplus
}
#endif
--
2.15.1

35
bsp/buildroot/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch
View File

@@ -1,35 +0,0 @@
From 45ca5d3fcb6f874bf5ba55d0e9651cef68515395 Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 18 Oct 2017 14:50:03 -0400
Subject: [PATCH] in dns parsing callback, enforce MAXADDRS to preclude
overflow
MAXADDRS was chosen not to need enforcement, but the logic used to
compute it assumes the answers received match the RR types of the
queries. specifically, it assumes that only one replu contains A
record answers. if the replies to both the A and the AAAA query have
their answer sections filled with A records, MAXADDRS can be exceeded
and clobber the stack of the calling function.
this bug was found and reported by Felix Wilhelm.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
src/network/lookup_name.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c
index 066be4d5..209c20f0 100644
--- a/src/network/lookup_name.c
+++ b/src/network/lookup_name.c
@@ -111,6 +111,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const
{
char tmp[256];
struct dpc_ctx *ctx = c;
+ if (ctx->cnt >= MAXADDRS) return -1;
switch (rr) {
case RR_A:
if (len != 4) return -1;
--
2.11.0

2
bsp/buildroot/package/musl/Config.in
View File

@@ -1,7 +1,7 @@
config BR2_PACKAGE_MUSL
bool
depends on BR2_TOOLCHAIN_USES_MUSL
default y
depends on BR2_TOOLCHAIN_USES_MUSL
select BR2_PACKAGE_LINUX_HEADERS
# SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2
select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc)

5
bsp/buildroot/package/musl/musl.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated after checking pgp signature
sha256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 musl-1.1.16.tar.gz
# Locally calculated after checking pgp signature from
# http://www.musl-libc.org/releases/musl-1.1.18.tar.gz.asc
sha256 d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 musl-1.1.18.tar.gz

2
bsp/buildroot/package/musl/musl.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
MUSL_VERSION = 1.1.16
MUSL_VERSION = 1.1.18
MUSL_SITE = http://www.musl-libc.org/releases
MUSL_LICENSE = MIT
MUSL_LICENSE_FILES = COPYRIGHT