From f36962e97106e904b4cdc1ff8059397493b68bcd Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 7 Nov 2017 10:26:23 +0100 Subject: [PATCH 01/42] CHANGES: add toolchain info missing from 2017.11-rc1 This was missed from the release update. Signed-off-by: Peter Korsgaard --- CHANGES | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES b/CHANGES index 632660ef82..a9f3365bf1 100644 --- a/CHANGES +++ b/CHANGES @@ -15,6 +15,11 @@ bit bigger than before. To remove unneeded MIBS, you should use a post-build script. + Toolchain: Linaro toolchains updated to 2017.08, ARC toolchain + updated to 2017.09, Glibc updated to 2.26, Glibc support for + ARCv2. The toolchain wrapper now handles SOURCE_DATE_EPOCH for + older (pre-gcc7.x) toolchains for BR2_REPRODUCIBLE. + New defconfigs: Atmel SAM45D27, Bananapi M1 and M2 Plus, Engicam i.CoreM6 Qt5 configuration, i.MX6 sabreauto (mainline kernel/u-boot), i.MX6Q sabresd Qt5 configuration, i.MX7d-pico, From 708316f49fd08170e75d9c9eab61a4b3b1280bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 6 Nov 2017 21:53:21 +0100 Subject: [PATCH 02/42] wireshark: bump version to 2.2.10 (security) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Security fixes since 2.2.7: - wnpa-sec-2017-22 Bazaar dissector infinite loop (Bug 13599) CVE-2017-9352 - wnpa-sec-2017-23 DOF dissector read overflow (Bug 13608) CVE-2017-9348 - wnpa-sec-2017-24 DHCP dissector read overflow (Bug 13609, Bug 13628) CVE-2017-9351 - wnpa-sec-2017-25 SoulSeek dissector infinite loop (Bug 13631) CVE-2017-9346 - wnpa-sec-2017-26 DNS dissector infinite loop (Bug 13633) CVE-2017-9345 - wnpa-sec-2017-27 DICOM dissector infinite loop (Bug 13685) CVE-2017-9349 - wnpa-sec-2017-28 openSAFETY dissector memory exhaustion (Bug 13649) CVE-2017-9350 - wnpa-sec-2017-29 BT L2CAP dissector divide by zero (Bug 13701) CVE-2017-9344 - wnpa-sec-2017-30 MSNIP dissector crash (Bug 13725) CVE-2017-9343 - wnpa-sec-2017-31 ROS dissector crash (Bug 13637) CVE-2017-9347 - wnpa-sec-2017-32 RGMP dissector crash (Bug 13646) CVE-2017-9354 - wnpa-sec-2017-33 IPv6 dissector crash (Bug 13675) CVE-2017-9353 - wnpa-sec-2017-13 WBMXL dissector infinite loop (Bug 13477, Bug 13796) CVE-2017-7702, CVE-2017-11410 Note: This is an update for a fix in Wireshark 2.2.6 and 2.0.12. - wnpa-sec-2017-28 openSAFETY dissector memory exhaustion (Bug 13649, Bug 13755) CVE-2017-9350, CVE-2017-11411 Note: This is an update for a fix in Wireshark 2.2.7. - wnpa-sec-2017-34 AMQP dissector crash. (Bug 13780) CVE-2017-11408 - wnpa-sec-2017-35 MQ dissector crash. (Bug 13792) CVE-2017-11407 - wnpa-sec-2017-36 DOCSIS infinite loop. (Bug 13797) CVE-2017-11406 - wnpa-sec-2017-38 MSDP dissector infinite loop (Bug 13933) - wnpa-sec-2017-39 Profinet I/O buffer overrun (Bug 13847) - wnpa-sec-2017-41 IrCOMM dissector buffer overrun (Bug 13929) Full release notes: https://www.wireshark.org/docs/relnotes/wireshark-2.2.10.html Signed-off-by: André Hentschel Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index c61c52097c..3494f2e5bf 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,2 +1,2 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.7.txt -sha256 689ddf62221b152779d8846ab5b2063cc7fd41ec1a9f04eefab09b5d5486dbb5 wireshark-2.2.7.tar.bz2 +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.10.txt +sha256 8574a5e1fdec7affae640924bd46c1aed1bd866e02632fa5625e1450e4a50707 wireshark-2.2.10.tar.bz2 diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 58292f7f1b..34ee563f18 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.2.7 +WIRESHARK_VERSION = 2.2.10 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 335eb9845eae4afa0288c8666a363508f41f0e4e Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Mon, 6 Nov 2017 19:08:54 -0600 Subject: [PATCH 03/42] DEVELOPERS: add myself to packages Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- DEVELOPERS | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index c651bf26fa..d198c612a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1030,32 +1030,73 @@ F: configs/ts4900_defconfig F: package/ts4900-fpga/ N: Matt Weber +F: package/argp-standalone/ +F: package/aufs/ +F: package/aufs-util/ F: package/bc/ +F: package/bridge-utils/ F: package/checkpolicy/ F: package/cgroupfs-mount/ +F: package/crda/ +F: package/devmem2/ +F: package/dnsmasq/ +F: package/dosfstools/ +F: package/eeprog/ F: package/eigen/ +F: package/ethtool/ +F: package/flashbench/ F: package/fmc/ F: package/fmlib/ +F: package/git/ +F: package/gnutls/ +F: package/hostapd/ +F: package/i2c-tools/ +F: package/ifplugd/ F: package/igmpproxy/ +F: package/iperf/ +F: package/iperf3/ F: package/iputils/ +F: package/iw/ F: package/libcsv/ +F: package/libcurl/ +F: package/libfcgi/ +F: package/libopenssl/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libssh2/ F: package/libqmi/ +F: package/lighttpd/ +F: package/logrotate/ +F: package/makedevs/ +F: package/memtester/ +F: package/mii-diag/ +F: package/mrouted/ +F: package/mtd/ +F: package/mtools/ F: package/nginx-upload/ F: package/omniorb/ F: package/paxtest/ +F: package/picocom/ F: package/policycoreutils/ +F: package/proftpd/ +F: package/protobuf-c/ +F: package/protobuf/ F: package/python-ipy/ F: package/python-posix-ipc/ F: package/python-pypcap/ F: package/python-pyrex/ F: package/raptor/ +F: package/rng-tools/ +F: package/rsyslog/ F: package/setools/ F: package/smcroute/ F: package/tclap/ +F: package/uboot-tools/ +F: package/unionfs/ F: package/valijson/ +F: package/wpa_supplicant/ +F: package/wireless-tools/ N: Mauro Condarelli F: package/mc/ From 50b82e8b9512f3ce054655097433b268e92b0cb4 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 7 Nov 2017 15:47:43 -0600 Subject: [PATCH 04/42] DEVELOPERS: fix wireless_tools entry Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index d198c612a9..cfbe64b0b2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1096,7 +1096,7 @@ F: package/uboot-tools/ F: package/unionfs/ F: package/valijson/ F: package/wpa_supplicant/ -F: package/wireless-tools/ +F: package/wireless_tools/ N: Mauro Condarelli F: package/mc/ From d7f9f1da6b09a8658e66a46c55b15186921098a9 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 7 Nov 2017 15:47:44 -0600 Subject: [PATCH 05/42] Manual: DEVELOPERS file integrity check Signed-off-by: Matthew Weber Signed-off-by: Peter Korsgaard --- docs/manual/developers.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/manual/developers.txt b/docs/manual/developers.txt index 4e2cd71638..a0a3668dbc 100644 --- a/docs/manual/developers.txt +++ b/docs/manual/developers.txt @@ -44,3 +44,5 @@ the +DEVELOPERS+ file for various tasks: list the ones that are not handled by any developer. The purpose of this option is to help completing the +DEVELOPERS+ file. +- When using without any arguments, it validates the integrity of the + DEVELOPERS file and will note WARNINGS for items that don't match. From 8744fedee4daec90be10a6d8ce303f4552a47ffa Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 8 Nov 2017 08:36:37 -0200 Subject: [PATCH 06/42] linux: bump default to version 4.13.12 Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 6300e7a70b..e90ab6bfeb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -116,7 +116,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "4.13.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "4.13.12" if BR2_LINUX_KERNEL_LATEST_VERSION default "v4.4.83-cip8" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ if BR2_LINUX_KERNEL_CUSTOM_VERSION From 2aa12565d6645b5bf85b0da8f0b736f5482f1333 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 8 Nov 2017 08:36:38 -0200 Subject: [PATCH 07/42] linux-headers: bump 4.{4, 9, 13}.x series Signed-off-by: Fabio Estevam Signed-off-by: Peter Korsgaard --- package/linux-headers/Config.in.host | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cb915cc6a0..82a27f84f3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -244,10 +244,10 @@ config BR2_DEFAULT_KERNEL_HEADERS default "3.10.107" if BR2_KERNEL_HEADERS_3_10 default "3.12.74" if BR2_KERNEL_HEADERS_3_12 default "4.1.45" if BR2_KERNEL_HEADERS_4_1 - default "4.4.96" if BR2_KERNEL_HEADERS_4_4 - default "4.9.60" if BR2_KERNEL_HEADERS_4_9 + default "4.4.97" if BR2_KERNEL_HEADERS_4_4 + default "4.9.61" if BR2_KERNEL_HEADERS_4_9 default "4.10.17" if BR2_KERNEL_HEADERS_4_10 default "4.11.12" if BR2_KERNEL_HEADERS_4_11 default "4.12.14" if BR2_KERNEL_HEADERS_4_12 - default "4.13.11" if BR2_KERNEL_HEADERS_4_13 + default "4.13.12" if BR2_KERNEL_HEADERS_4_13 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION From 8a2111258ace2fc4d01a6bb3d3287ec0115eef29 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 7 Nov 2017 16:29:06 -0500 Subject: [PATCH 08/42] ntp: no longer require openssl 4.2.8p10 no longer requires openssl to compile. Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/ntp/Config.in | 1 - package/ntp/ntp.mk | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/ntp/Config.in b/package/ntp/Config.in index 1af02dbc0b..8ce9a5b0bb 100644 --- a/package/ntp/Config.in +++ b/package/ntp/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_NTP bool "ntp" select BR2_PACKAGE_LIBEVENT - select BR2_PACKAGE_OPENSSL help Network Time Protocol suite/programs. Provides things like ntpd, ntpdate, ntpq, etc... diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index c70d6e6351..6605c3b85b 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -7,7 +7,7 @@ NTP_VERSION_MAJOR = 4.2 NTP_VERSION = $(NTP_VERSION_MAJOR).8p10 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) -NTP_DEPENDENCIES = host-pkgconf libevent openssl $(if $(BR2_PACKAGE_BUSYBOX),busybox) +NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox) NTP_LICENSE = NTP NTP_LICENSE_FILES = COPYRIGHT NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no @@ -18,12 +18,18 @@ NTP_CONF_OPTS = \ --disable-debugging \ --with-yielding-select=yes \ --disable-local-libevent \ - --with-crypto # 0002-ntp-syscalls-fallback.patch # 0003-ntpq-fpic.patch NTP_AUTORECONF = YES +ifeq ($(BR2_PACKAGE_OPENSSL),y) +NTP_CONF_OPTS += --with-crypto +NTP_DEPENDENCIES += openssl +else +NTP_CONF_OPTS += --without-crypto --disable-openssl-random +endif + ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) NTP_CONF_OPTS += --with-locfile=linux else From bca1d4af9bf6b60b37bf5d39e9e3e1b827854f52 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 6 Nov 2017 15:17:09 +0100 Subject: [PATCH 09/42] jimtcl: update config.guess / config.sub Fixes: http://autobuild.buildroot.net/results/284/284876bd649cab26e5ecd696c03c71c077ea7411/ The build system doesn't use autotools, but does use an old version of gnuconfig which doesn't know all the architectures supported by Buildroot, so update config.guess / config.sub like we do in pkg-autotools.mk Signed-off-by: Peter Korsgaard --- package/jimtcl/jimtcl.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index 313970d94a..68c8a914db 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -38,6 +38,12 @@ define JIMTCL_INSTALL_LIB endef endif +# build system doesn't use autotools, but does use an old version of +# gnuconfig which doesn't know all the architectures supported by +# Buildroot, so update config.guess / config.sub like we do in +# pkg-autotools.mk +JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK + define JIMTCL_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) CCACHE=none \ From 90d86994f86fec8578772a8a7465bf912c69e1ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 6 Nov 2017 15:17:10 +0100 Subject: [PATCH 10/42] usb_modeswitch: update config.guess / config.sub Fixes: http://autobuild.buildroot.net/results/fbe/fbe21bd173e6566dd93dddd58d4a848de8a3465e/ The build system of the embedded jimtcl copy doesn't use autotools, but does use an old version of gnuconfig which doesn't know all the architectures supported by Buildroot, so update config.guess / config.sub like we do in pkg-autotools.mk Signed-off-by: Peter Korsgaard --- package/usb_modeswitch/usb_modeswitch.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index ea08de256b..c67d4cd583 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -20,6 +20,12 @@ USB_MODESWITCH_BUILD_TARGETS = script USB_MODESWITCH_INSTALL_TARGETS = install-script endif +# build system of embedded jimtcl doesn't use autotools, but does use +# an old version of gnuconfig which doesn't know all the architectures +# supported by Buildroot, so update config.guess / config.sub like we +# do in pkg-autotools.mk +USB_MODESWITCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK + define USB_MODESWITCH_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \ From a3fda8e292c4b5b98482b5b75f551476c570a034 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Nov 2017 23:10:59 +0100 Subject: [PATCH 11/42] go-bootstrap: add BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS go-bootstrap is a host package that builds a first stage Go compiler, later used to build the final Go compiler. However, this first stage compiler only supports building on x86, x86-64 and arm as host architectures, so we need to add the relevant architecture dependencies to avoid having go-bootstrap built on other unsupported platforms. We do this by introducing BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS in a new package/go-bootstrap/Config.in.host file. This option is then used by BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS to make sure we can't enable Go packages when the host architecture doesn't allow building the Go compiler. Fixes: http://autobuild.buildroot.net/results/cbd419c6ab6fa8a6d18dc137c91f895867e53b8a/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in.host | 1 + package/go-bootstrap/Config.in.host | 7 +++++++ package/go/Config.in.host | 1 + 3 files changed, 9 insertions(+) create mode 100644 package/go-bootstrap/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 3755310de4..59be666143 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -19,6 +19,7 @@ menu "Host utilities" source "package/genimage/Config.in.host" source "package/genpart/Config.in.host" source "package/go/Config.in.host" + source "package/go-bootstrap/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imx-usb-loader/Config.in.host" source "package/jq/Config.in.host" diff --git a/package/go-bootstrap/Config.in.host b/package/go-bootstrap/Config.in.host new file mode 100644 index 0000000000..fab80d24b4 --- /dev/null +++ b/package/go-bootstrap/Config.in.host @@ -0,0 +1,7 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS + bool + # See src/cmd/dist/unix.c for the list of support + # architectures + default y if BR2_HOSTARCH = "x86" + default y if BR2_HOSTARCH = "x86_64" + default y if BR2_HOSTARCH = "arm" diff --git a/package/go/Config.in.host b/package/go/Config.in.host index a210033efd..c871ac4196 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS bool default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ || BR2_mips64 || BR2_mips64el From 582496635cd26678f8c1b9a48b73c0e1d8534d01 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Wed, 8 Nov 2017 11:25:41 +0000 Subject: [PATCH 12/42] package/nodejs: bump version to 8.9.1 See https://nodejs.org/en/blog/release/v8.9.1/ Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 9367c543be..658f80baaa 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,2 +1,2 @@ -# From http://nodejs.org/dist/v8.8.1/SHASUMS256.txt -sha256 5ce2c47ab779992db49942f757a01cc5131db5cef4e0dd270e48151b0887b57a node-v8.8.1.tar.xz +# From http://nodejs.org/dist/v8.9.1/SHASUMS256.txt +sha256 ef160c21f60f8aca64145985e01b4044435e381dc16e8f0640ed0223e84f17e0 node-v8.9.1.tar.xz diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index a29f5726cc..9cf26da601 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 8.8.1 +NODEJS_VERSION = 8.9.1 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ From 0521285e6703eb3408139e5c6e6ee04ef3f59bb0 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Wed, 8 Nov 2017 11:25:42 +0000 Subject: [PATCH 13/42] package/libuv: bump version to 1.16.0 See https://github.com/libuv/libuv/releases/tag/v1.16.0 Signed-off-by: Martin Bark Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 5b29640d2c..748e1d2f0f 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 17afc94ec307be28fe8d4316679171219770df4f993905a79643c7583e106489 libuv-v1.15.0.tar.gz +sha256 fe53b53eee3b15db8ae1b25cbfb8740944273e02f5ccd731b176800e2807d832 libuv-v1.16.0.tar.gz diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 504f621c85..bbb42823b4 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.15.0 +LIBUV_VERSION = v1.16.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 4bdc4e492ba75d34d859ca15f0c21ec8078785fc Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 9 Nov 2017 16:51:47 -0500 Subject: [PATCH 14/42] libpjsip: security bump to 2.7.1 Also add hash for license file See release notes for details: https://trac.pjsip.org/repos/milestone/release-2.7.1 Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard --- package/libpjsip/libpjsip.hash | 7 ++++--- package/libpjsip/libpjsip.mk | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/libpjsip/libpjsip.hash b/package/libpjsip/libpjsip.hash index b35fed3403..edac3d578f 100644 --- a/package/libpjsip/libpjsip.hash +++ b/package/libpjsip/libpjsip.hash @@ -1,5 +1,6 @@ -# From http://www.pjsip.org/release/2.7/MD5SUM.TXT -md5 c0d322261e526cafecc176facbb0bab7 pjproject-2.7.tar.bz2 +# From http://www.pjsip.org/release/2.7.1/MD5SUM.TXT +md5 99a64110fa5c2debff40e0e8d4676380 pjproject-2.7.1.tar.bz2 # Locally computed -sha256 1c80621a11c39151b3c2511f06abc8ef031fc712bb2f9e9923b5301b04b28f6b pjproject-2.7.tar.bz2 +sha256 59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126 pjproject-2.7.1.tar.bz2 +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/libpjsip/libpjsip.mk b/package/libpjsip/libpjsip.mk index a7fbd21503..6f3f9e3f1a 100644 --- a/package/libpjsip/libpjsip.mk +++ b/package/libpjsip/libpjsip.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPJSIP_VERSION = 2.7 +LIBPJSIP_VERSION = 2.7.1 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) LIBPJSIP_DEPENDENCIES = libsrtp From 5ff18880e9647e446a3d720b7c6c74eed97ef0b4 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Fri, 10 Nov 2017 16:03:04 +0200 Subject: [PATCH 15/42] webkitgtk: security bump to version 2.18.3 This is a maintenance release of the current stable WebKitGTK+ version, which contains a minor rendering fix, another for the WebDriver implementation, and security fixes for CVE-2017-13798, CVE-2017-13788, and CVE-2017-13803. Release notes: https://webkitgtk.org/2017/11/10/webkitgtk2.18.3-released.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index b1161157e7..669bb1cc62 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,4 +1,4 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.18.2.tar.xz.sums -md5 f63b3897d6fbf660bf72dfaca1fdea16 webkitgtk-2.18.2.tar.xz -sha1 75571807a1f8c9efdf62f1c37e9fadf52b73d367 webkitgtk-2.18.2.tar.xz -sha256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 webkitgtk-2.18.2.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.18.3.tar.xz.sums +md5 264a22d7467deae606e42b6eb5dd65af webkitgtk-2.18.3.tar.xz +sha1 164cad34281ef597a3d4ad214e8037c3ddef4d17 webkitgtk-2.18.3.tar.xz +sha256 e15420e1616a6f70f321541d467af5ca285bff66b1e0fa68a01df3ccf1b18f9e webkitgtk-2.18.3.tar.xz diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index c78f6b38e1..c4675463fa 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.18.2 +WEBKITGTK_VERSION = 2.18.3 WEBKITGTK_SITE = http://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From f8281ab59ec777b93f15e048dfad8190f906042f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Thu, 9 Nov 2017 20:52:54 +0200 Subject: [PATCH 16/42] DEVELOPERS: add packages to Baruch Siach Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- DEVELOPERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index cfbe64b0b2..ddd675ea3a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -190,9 +190,15 @@ F: package/sigrok-cli/ N: Baruch Siach F: package/daemon/ +F: package/dropbear/ F: package/ebtables/ +F: package/i2c-tools/ +F: package/libcurl/ +F: package/libpcap/ F: package/openipmi/ F: package/socat/ +F: package/strace/ +F: package/tcpdump/ F: package/ti-uim/ F: package/uhubctl/ From bd2544d3d3903935fc4dc0ec9c930720441e545f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Nov 2017 17:22:41 +0100 Subject: [PATCH 17/42] package/ffmpeg: simplify BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS logic Suggested by Arnout: http://lists.busybox.net/pipermail/buildroot/2017-November/206631.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/ffmpeg/Config.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index ed87ddd492..17a4881348 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -1,15 +1,19 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS bool + default y # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 + depends on !BR2_nios # No support for ARMv7-M in the ARM assembly logic + depends on !BR2_ARM_CPU_ARMV7M # Microblaze build affected by gcc PR71124 (infinite loop) + depends on !BR2_microblaze # m68k coldfire causes a build failure, because the check for # atomics (atomic_store) succeeds, which causes ffmpeg to # think atomic intrinsics are available, while they are # not. See https://patchwork.ozlabs.org/patch/756664/ and # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more # details. - default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze && !BR2_m68k_cf + depends on !BR2_m68k_cf menuconfig BR2_PACKAGE_FFMPEG bool "ffmpeg" From 0a0042f6d7a526d4addce81286ca77c0a8ca656f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Nov 2017 17:22:42 +0100 Subject: [PATCH 18/42] package/ffmpeg: fix fenv build failure on ARCv2 with glibc https://git.buildroot.net/buildroot/commit/toolchain?id=0633eb58a2912328508a76f8fe9875a0d113a880 added glibc support for ARCv2 which lacks fenv.h. Code format was suggested by Arnout: http://lists.busybox.net/pipermail/buildroot/2017-November/206631.html Fixes http://autobuild.buildroot.net/results/aec/aec300d7d4472421398a24202d6871c965bd1be5/ Signed-off-by: Bernd Kuhls [Thomas: adjust how the Config.in dependency is expressed.] Signed-off-by: Thomas Petazzoni --- package/ffmpeg/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 17a4881348..487ca449c8 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS bool default y + # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW + depends on !(BR2_archs38 && BR2_TOOLCHAIN_USES_GLIBC) # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 depends on !BR2_nios # No support for ARMv7-M in the ARM assembly logic From b97353f2b50add10971e8477ad0b4cede9244578 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 11 Nov 2017 11:44:56 +0100 Subject: [PATCH 19/42] postgresql: security bump to version 9.6.6 Fixes the following security issues: CVE-2017-12172: Start scripts permit database administrator to modify root-owned files. CVE-2017-15098: Memory disclosure in JSON functions. CVE-2017-15099: INSERT ... ON CONFLICT DO UPDATE fails to enforce SELECT privileges. See the announcement for more details: https://www.postgresql.org/about/news/1801/ While we're at it, also add a hash for the license file. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/postgresql/postgresql.hash | 6 ++++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 62ce9a7407..e62838911e 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,2 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.5/postgresql-9.6.5.tar.bz2.sha256 -sha256 06da12a7e3dddeb803962af8309fa06da9d6989f49e22865335f0a14bad0744c postgresql-9.6.5.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v9.6.6/postgresql-9.6.6.tar.bz2.sha256 +sha256 399cdffcb872f785ba67e25d275463d74521566318cfef8fe219050d063c8154 postgresql-9.6.6.tar.bz2 +# License file, Locally calculated +sha256 7dc8de32741ad1b03e21710771b55a1b9d460671d47f28a8840f917e38c66676 COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index 7adb957cf0..50ce212c1c 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 9.6.5 +POSTGRESQL_VERSION = 9.6.6 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From a6facc809b01e1c7b02bb93ede4a4bff7b91a091 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 11 Nov 2017 17:41:53 +0100 Subject: [PATCH 20/42] package/openjpeg: fix build with threads disabled Fixes http://autobuild.buildroot.net/results/f16/f16a558c30199a92e93a31e0ba391b99a9bd689f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openjpeg/openjpeg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index df85168b80..9a8fdab7a4 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -15,4 +15,10 @@ OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LCMS2),lcms2) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +OPENJPEG_CONF_OPTS += -DOPJ_USE_THREAD=ON +else +OPENJPEG_CONF_OPTS += -DOPJ_USE_THREAD=OFF +endif + $(eval $(cmake-package)) From 855002f22b4795b7ff3e37880c3ed65011cd036c Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Thu, 9 Nov 2017 18:15:50 +0300 Subject: [PATCH 21/42] python-numpy: reformat BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS Current BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS variable layout going to be inconvenient and ugly for adding new architectures or restricting specific architectures. Lets reformat layout of this variable. Signed-off-by: Evgeniy Didin Cc: Alexey Brodkin Cc: arc-buildroot@synopsys.com Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/python-numpy/Config.in | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 859542f584..5abe04bde9 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -1,9 +1,17 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS bool # Numpy has some CPU specific code - default y if BR2_arc || BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \ - || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \ - || BR2_sh || BR2_x86_64 + default y if BR2_arc + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_armeb + default y if BR2_i386 + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_powerpc + default y if BR2_powerpc64 + default y if BR2_sh + default y if BR2_x86_64 config BR2_PACKAGE_PYTHON_NUMPY bool "python-numpy" From 636f4d81ff4be52dc7818c51b9d479a9cb6ecea1 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin Date: Thu, 9 Nov 2017 18:15:51 +0300 Subject: [PATCH 22/42] python-numpy: disable for ARCompact This package fails when building for ARCompact due to toolchain issue. Marking this with special comment "#ARC toolchain issues for ARCompact" as the package is to be enabled as soon as the issue with the ARC toolchain is resolved. Fixes: http://autobuild.buildroot.net/results/4c4eaa90335756448007ae3c5ae3839fb17d4442/ Signed-off-by: Evgeniy Didin Cc: Alexey Brodkin Cc: arc-buildroot@synopsys.com Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/python-numpy/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 5abe04bde9..1405218b1c 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -1,7 +1,8 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS bool # Numpy has some CPU specific code - default y if BR2_arc + # ARC toolchain issues for ARCompact + default y if BR2_arc && !(BR2_arc770d || BR2_arc750d) default y if BR2_aarch64 default y if BR2_arm default y if BR2_armeb From bdd8475b90fa46644149d34bf852b213ec60ce71 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 7 Nov 2017 12:04:42 -0800 Subject: [PATCH 23/42] package/collectd: Specify FP layout based on endianness Big-endian CPUs store floating point as big endian (at lest majority of them do), so, in order for 'network' plugin to work correctly (and potentially any user of htond() in collectd's codebase), --with-fp-layout=endianflip as opposed to --with-fp-layout=nothing needs to be specified during configuration phase. Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Gustavo Zacarias Signed-off-by: Andrey Smirnov Reviewed-by: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/collectd/collectd.mk | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 626fba81bf..6c987b2e36 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -24,9 +24,23 @@ COLLECTD_PLUGINS_DISABLE = \ COLLECTD_CONF_ENV += LIBS="-lm" +# +# NOTE: There's also a third availible setting "intswap", which might +# be needed on some old ARM hardware (see [2]), but is not being +# accounted for as per discussion [1] +# +# [1] http://lists.busybox.net/pipermail/buildroot/2017-November/206100.html +# [2] http://lists.busybox.net/pipermail/buildroot/2017-November/206251.html +# +ifeq ($(BR2_ENDIAN),"BIG") +COLLECTD_FP_LAYOUT=endianflip +else +COLLECTD_FP_LAYOUT=nothing +endif + COLLECTD_CONF_OPTS += \ --with-nan-emulation \ - --with-fp-layout=nothing \ + --with-fp-layout=$(COLLECTD_FP_LAYOUT) \ --with-perl-bindings=no \ $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ $(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \ From 6be1631bf27cb0d2aa6ddcbad835d614f33698e6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 8 Nov 2017 07:00:33 -0500 Subject: [PATCH 24/42] snmp++: security bump to v3.3.10 >From the changelong: Set the FD_CLOEXEC flag on sockets, so they are not "leaked" to spawned processes Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/snmppp/snmppp.hash | 3 ++- package/snmppp/snmppp.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 75ecddade2..5c8feee152 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 2ef0cb20658c1eb9e053f8a7a9d5c8f5ebf2f734d37b692fdbf7163ea17dde6f snmp++-3.3.9.tar.gz +sha256 6827adb6a6a68a7f32c41fa12bdfd0aa48f4825b8773f63fc4d5c8482d4ed481 snmp++-3.3.10.tar.gz +sha256 d00d5deb9ce44fa01ddf6f882de3ea8b9e8402f776b546dd982d55367ebbd392 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 67410d9e4d..4ceb61c9fc 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.3.9 +SNMPPP_VERSION = 3.3.10 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From 1a4b5bb4b21f05dd42ddd6158d74d431ac003c92 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Wed, 8 Nov 2017 18:38:01 +0100 Subject: [PATCH 25/42] util-linux: fix link failures due to name clash Several packages have a similar md5.c file, and each has a function named byteReverse(). This generates link errors when building statically ("multiple definition of `byteReverse'"). Fix by applying a patch from upstream. Fixes: http://autobuild.buildroot.net/results/419ab2c0e034cc68991281c51caa8271b0fadbab/ Signed-off-by: Luca Ceresoli Cc: Adam Duskett Tested-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- ...01-md5-declare-byteReverse-as-static.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/util-linux/0001-md5-declare-byteReverse-as-static.patch diff --git a/package/util-linux/0001-md5-declare-byteReverse-as-static.patch b/package/util-linux/0001-md5-declare-byteReverse-as-static.patch new file mode 100644 index 0000000000..a5b290c4db --- /dev/null +++ b/package/util-linux/0001-md5-declare-byteReverse-as-static.patch @@ -0,0 +1,44 @@ +From 424cee0f06ece9473786c189ab4741e1dea7061d Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Tue, 7 Nov 2017 14:39:09 +0100 +Subject: [PATCH] md5: declare byteReverse as static + +byteReverse() is an internal function in md5.c, and is not exposed via +any header file, but it is not declared as static. This is a problem +with the md5.c file since it is copied more or less verbatim in other +programs (fontconfig and pjsip among others), causing a link error +when linking two of them together. + +Fixes link failures such as: + http://autobuild.buildroot.net/results/419ab2c0e034cc68991281c51caa8271b0fadbab/build-end.log + +[Upstream patch: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=424cee0f06ece9473786c189ab4741e1dea7061d] + +Signed-off-by: Luca Ceresoli +--- + lib/md5.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/md5.c b/lib/md5.c +index 488d16ef69b4..282e2d22af25 100644 +--- a/lib/md5.c ++++ b/lib/md5.c +@@ -21,13 +21,13 @@ + #if !defined(WORDS_BIGENDIAN) + #define byteReverse(buf, len) /* Nothing */ + #else +-void byteReverse(unsigned char *buf, unsigned longs); ++static void byteReverse(unsigned char *buf, unsigned longs); + + #ifndef ASM_MD5 + /* + * Note: this code is harmless on little-endian machines. + */ +-void byteReverse(unsigned char *buf, unsigned longs) ++static void byteReverse(unsigned char *buf, unsigned longs) + { + uint32_t t; + do { +-- +2.7.4 + From d127d1159c15eb985f71707b59afe3a4038fe91f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Nov 2017 15:21:43 +0100 Subject: [PATCH 26/42] support/config-fragments/autobuild: update toolchains for 2017.11-rc1 All Buildroot pre-built toolchains have been rebuilt with Buildroot 2017.11-rc1, so that they have the latest version of glibc/musl/uClibc, and also the latest gcc/binutils updates. Specifically, this will fix the build failures on Blackfin that were due to the missing accept4() support: http://autobuild.buildroot.net/results/8b5a72dd7cde685f6f68f46aeee8b1b60c96d559/ (openobex) http://autobuild.buildroot.net/results/b19dd9ed29944d7f79c6f824669e3baaa0bb045a/ (libiio) In terms of changes to the toolchains: - AArch64 glibc toolchain changed to use 4.4 kernel headers instead of 4.1, in order to increase the variety of kernel header versions being tested. - Most configurations now use 4.13 kernel headers instead of 4.12 (except the configurations that were explicitly using an older kernel headers version) - The mips64 n64 configuration is changed from using gcc 4.9 to gcc 5, since another ARM configuration already tests gcc 4.9. Signed-off-by: Thomas Petazzoni --- support/config-fragments/autobuild/br-aarch64-glibc.config | 4 ++-- support/config-fragments/autobuild/br-arcle-hs38.config | 4 ++-- support/config-fragments/autobuild/br-arm-basic.config | 4 ++-- .../autobuild/br-arm-cortex-a9-glibc.config | 4 ++-- .../config-fragments/autobuild/br-arm-cortex-a9-musl.config | 4 ++-- .../config-fragments/autobuild/br-arm-cortex-m4-full.config | 4 ++-- .../config-fragments/autobuild/br-arm-full-nothread.config | 4 ++-- .../config-fragments/autobuild/br-arm-full-static.config | 2 +- support/config-fragments/autobuild/br-arm-full.config | 2 +- support/config-fragments/autobuild/br-bfin-full.config | 4 ++-- .../autobuild/br-i386-pentium-mmx-musl.config | 2 +- .../config-fragments/autobuild/br-i386-pentium4-full.config | 2 +- support/config-fragments/autobuild/br-m68k-5208-full.config | 4 ++-- .../config-fragments/autobuild/br-m68k-68040-full.config | 4 ++-- .../config-fragments/autobuild/br-microblazeel-full.config | 2 +- .../autobuild/br-mips32r6-el-hf-glibc.config | 4 ++-- .../config-fragments/autobuild/br-mips64-n64-full.config | 6 +++--- .../autobuild/br-mips64r6-el-hf-glibc.config | 4 ++-- .../config-fragments/autobuild/br-mipsel-o32-full.config | 4 ++-- support/config-fragments/autobuild/br-nios2-glibc.config | 4 ++-- .../config-fragments/autobuild/br-openrisc-uclibc.config | 4 ++-- .../autobuild/br-powerpc-603e-basic-cpp.config | 4 ++-- .../autobuild/br-powerpc-e500mc-full.config | 4 ++-- .../autobuild/br-powerpc64-power7-glibc.config | 4 ++-- .../autobuild/br-powerpc64le-power8-glibc.config | 4 ++-- support/config-fragments/autobuild/br-sh4-full.config | 4 ++-- support/config-fragments/autobuild/br-sparc-uclibc.config | 2 +- support/config-fragments/autobuild/br-sparc64-glibc.config | 2 +- .../config-fragments/autobuild/br-x86-64-core2-full.config | 2 +- support/config-fragments/autobuild/br-x86-64-musl.config | 4 ++-- support/config-fragments/autobuild/br-xtensa-full.config | 4 ++-- 31 files changed, 55 insertions(+), 55 deletions(-) diff --git a/support/config-fragments/autobuild/br-aarch64-glibc.config b/support/config-fragments/autobuild/br-aarch64-glibc.config index 6501f15ec5..af1cbf890d 100644 --- a/support/config-fragments/autobuild/br-aarch64-glibc.config +++ b/support/config-fragments/autobuild/br-aarch64-glibc.config @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-arcle-hs38.config b/support/config-fragments/autobuild/br-arcle-hs38.config index b9f5764603..8484f62683 100644 --- a/support/config-fragments/autobuild/br-arcle-hs38.config +++ b/support/config-fragments/autobuild/br-arcle-hs38.config @@ -3,8 +3,8 @@ BR2_archs38=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2017.05-1078-g95b1dae.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_6=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2017.11-rc1.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_7=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-arm-basic.config b/support/config-fragments/autobuild/br-arm-basic.config index e47c742c6c..a420284cc5 100644 --- a/support/config-fragments/autobuild/br-arm-basic.config +++ b/support/config-fragments/autobuild/br-arm-basic.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set diff --git a/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config index 662de17b37..fea1564ab2 100644 --- a/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config +++ b/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_7=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config index 65e2edfa86..2db2aa0b77 100644 --- a/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config +++ b/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config @@ -4,8 +4,8 @@ BR2_ARM_ENABLE_VFP=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/support/config-fragments/autobuild/br-arm-cortex-m4-full.config index fc514b1d97..f60df91f45 100644 --- a/support/config-fragments/autobuild/br-arm-cortex-m4-full.config +++ b/support/config-fragments/autobuild/br-arm-cortex-m4-full.config @@ -3,9 +3,9 @@ BR2_cortex_m4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/support/config-fragments/autobuild/br-arm-full-nothread.config b/support/config-fragments/autobuild/br-arm-full-nothread.config index 1e260ec90d..33034cf77a 100644 --- a/support/config-fragments/autobuild/br-arm-full-nothread.config +++ b/support/config-fragments/autobuild/br-arm-full-nothread.config @@ -3,9 +3,9 @@ BR2_arm1176jzf_s=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-arm-full-static.config b/support/config-fragments/autobuild/br-arm-full-static.config index 065c454653..dd0a393136 100644 --- a/support/config-fragments/autobuild/br-arm-full-static.config +++ b/support/config-fragments/autobuild/br-arm-full-static.config @@ -3,7 +3,7 @@ BR2_STATIC_LIBS=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-arm-full.config b/support/config-fragments/autobuild/br-arm-full.config index 84c225d883..659d07ce18 100644 --- a/support/config-fragments/autobuild/br-arm-full.config +++ b/support/config-fragments/autobuild/br-arm-full.config @@ -2,7 +2,7 @@ BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-bfin-full.config b/support/config-fragments/autobuild/br-bfin-full.config index 7389bb53c3..eeefcefbee 100644 --- a/support/config-fragments/autobuild/br-bfin-full.config +++ b/support/config-fragments/autobuild/br-bfin-full.config @@ -3,9 +3,9 @@ BR2_bf512=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-bfin-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-bfin-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config index 65119c321e..b9041a7724 100644 --- a/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config +++ b/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config @@ -2,7 +2,7 @@ BR2_x86_pentium_mmx=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y diff --git a/support/config-fragments/autobuild/br-i386-pentium4-full.config b/support/config-fragments/autobuild/br-i386-pentium4-full.config index 37233c5975..08eb21b894 100644 --- a/support/config-fragments/autobuild/br-i386-pentium4-full.config +++ b/support/config-fragments/autobuild/br-i386-pentium4-full.config @@ -2,7 +2,7 @@ BR2_x86_pentium4=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-m68k-5208-full.config b/support/config-fragments/autobuild/br-m68k-5208-full.config index e6c6bdabad..bf455e0838 100644 --- a/support/config-fragments/autobuild/br-m68k-5208-full.config +++ b/support/config-fragments/autobuild/br-m68k-5208-full.config @@ -2,9 +2,9 @@ BR2_m68k=y BR2_m68k_cf5208=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/support/config-fragments/autobuild/br-m68k-68040-full.config b/support/config-fragments/autobuild/br-m68k-68040-full.config index 5cf68def9f..0766ffc3e8 100644 --- a/support/config-fragments/autobuild/br-m68k-68040-full.config +++ b/support/config-fragments/autobuild/br-m68k-68040-full.config @@ -1,9 +1,9 @@ BR2_m68k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/support/config-fragments/autobuild/br-microblazeel-full.config b/support/config-fragments/autobuild/br-microblazeel-full.config index 4cd72d1ef2..ea920f0a70 100644 --- a/support/config-fragments/autobuild/br-microblazeel-full.config +++ b/support/config-fragments/autobuild/br-microblazeel-full.config @@ -1,7 +1,7 @@ BR2_microblazeel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config index 86fb0148ec..237265bd82 100644 --- a/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config +++ b/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config @@ -4,8 +4,8 @@ BR2_mips_32r6=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-mips64-n64-full.config b/support/config-fragments/autobuild/br-mips64-n64-full.config index 503f0a2e7c..f8a67f2c65 100644 --- a/support/config-fragments/autobuild/br-mips64-n64-full.config +++ b/support/config-fragments/autobuild/br-mips64-n64-full.config @@ -3,8 +3,8 @@ BR2_MIPS_NABI64=y # BR2_MIPS_SOFT_FLOAT is not set BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2017.05-1078-g95b1dae.tar.bz2" -BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2017.11-rc1.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_GCC_5=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config index a8f9cb7f34..b0e9236063 100644 --- a/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +++ b/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config @@ -5,8 +5,8 @@ BR2_MIPS_NABI64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-mipsel-o32-full.config b/support/config-fragments/autobuild/br-mipsel-o32-full.config index e6cedfa225..e608b424a7 100644 --- a/support/config-fragments/autobuild/br-mipsel-o32-full.config +++ b/support/config-fragments/autobuild/br-mipsel-o32-full.config @@ -2,9 +2,9 @@ BR2_mipsel=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-nios2-glibc.config b/support/config-fragments/autobuild/br-nios2-glibc.config index c63e4a22cd..62f2665e44 100644 --- a/support/config-fragments/autobuild/br-nios2-glibc.config +++ b/support/config-fragments/autobuild/br-nios2-glibc.config @@ -2,8 +2,8 @@ BR2_nios2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-openrisc-uclibc.config b/support/config-fragments/autobuild/br-openrisc-uclibc.config index 04d6b3c8bd..3a4f0b62dd 100644 --- a/support/config-fragments/autobuild/br-openrisc-uclibc.config +++ b/support/config-fragments/autobuild/br-openrisc-uclibc.config @@ -1,9 +1,9 @@ BR2_or1k=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_5=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set diff --git a/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config index eaac058923..63cffef7e8 100644 --- a/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config +++ b/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config @@ -3,8 +3,8 @@ BR2_powerpc_603e=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/support/config-fragments/autobuild/br-powerpc-e500mc-full.config index f4c073779e..83b4c093d3 100644 --- a/support/config-fragments/autobuild/br-powerpc-e500mc-full.config +++ b/support/config-fragments/autobuild/br-powerpc-e500mc-full.config @@ -3,9 +3,9 @@ BR2_powerpc_e500mc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config index 6e31cbb7c7..99ab1695a2 100644 --- a/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +++ b/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64=y BR2_powerpc_power7=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config index 80d5b3c133..12e3e8fc68 100644 --- a/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config +++ b/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config @@ -2,8 +2,8 @@ BR2_powerpc64le=y BR2_powerpc_power8=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-sh4-full.config b/support/config-fragments/autobuild/br-sh4-full.config index b50e3528b6..884fbc793b 100644 --- a/support/config-fragments/autobuild/br-sh4-full.config +++ b/support/config-fragments/autobuild/br-sh4-full.config @@ -2,9 +2,9 @@ BR2_sh=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-sparc-uclibc.config b/support/config-fragments/autobuild/br-sparc-uclibc.config index e2a69bb56d..19bce355e5 100644 --- a/support/config-fragments/autobuild/br-sparc-uclibc.config +++ b/support/config-fragments/autobuild/br-sparc-uclibc.config @@ -1,7 +1,7 @@ BR2_sparc=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-sparc64-glibc.config b/support/config-fragments/autobuild/br-sparc64-glibc.config index c1d272141a..093de54b9b 100644 --- a/support/config-fragments/autobuild/br-sparc64-glibc.config +++ b/support/config-fragments/autobuild/br-sparc64-glibc.config @@ -1,7 +1,7 @@ BR2_sparc64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y diff --git a/support/config-fragments/autobuild/br-x86-64-core2-full.config b/support/config-fragments/autobuild/br-x86-64-core2-full.config index 56e2238731..c1ccddbe20 100644 --- a/support/config-fragments/autobuild/br-x86-64-core2-full.config +++ b/support/config-fragments/autobuild/br-x86-64-core2-full.config @@ -3,7 +3,7 @@ BR2_x86_core2=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y diff --git a/support/config-fragments/autobuild/br-x86-64-musl.config b/support/config-fragments/autobuild/br-x86-64-musl.config index 48f84cc79a..6ee19ab2ed 100644 --- a/support/config-fragments/autobuild/br-x86-64-musl.config +++ b/support/config-fragments/autobuild/br-x86-64-musl.config @@ -3,8 +3,8 @@ BR2_x86_atom=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y BR2_TOOLCHAIN_EXTERNAL_CXX=y diff --git a/support/config-fragments/autobuild/br-xtensa-full.config b/support/config-fragments/autobuild/br-xtensa-full.config index c98b3057cf..23e2b8b7ef 100644 --- a/support/config-fragments/autobuild/br-xtensa-full.config +++ b/support/config-fragments/autobuild/br-xtensa-full.config @@ -1,9 +1,9 @@ BR2_xtensa=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2017.05-1078-g95b1dae.tar.bz2" +BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2017.11-rc1.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_6=y -BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_CXX=y From bbb25c3ad7b66e6882508e49028d1739732bca34 Mon Sep 17 00:00:00 2001 From: Alex Suykov Date: Tue, 7 Nov 2017 12:17:15 +0200 Subject: [PATCH 27/42] vboot-utils: fix ARCH detection The package includes some target-specific code that is irrelevant in a host package but gets built anyway. The target for this code must be one of the supported ChromeOS targets. Supplied Makefile apparently relies on the environment to provide a valid target, with a simple fallback to host arch. This breaks the build if no value is provided and the host arch is not among the supported ones. Should fix http://autobuild.buildroot.net/results/d118a83b6c4f7f910d0d44c279f36251d7ba29e8/ and similar failures. Signed-off-by: Alex Suykov Signed-off-by: Thomas Petazzoni --- package/vboot-utils/vboot-utils.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/vboot-utils/vboot-utils.mk b/package/vboot-utils/vboot-utils.mk index a6a67ad317..3f63f458cc 100644 --- a/package/vboot-utils/vboot-utils.mk +++ b/package/vboot-utils/vboot-utils.mk @@ -21,12 +21,17 @@ HOST_VBOOT_UTILS_DEPENDENCIES = host-openssl host-util-linux host-pkgconf # media partitioning. # # make target for futility is "futil". +# +# The value of ARCH is only relevant for crossystem (a target tool) and +# does not affect futil or cgpt in any way as long as it is one of the +# supported targets. define HOST_VBOOT_UTILS_BUILD_CMDS $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ CC="$(HOSTCC)" \ CFLAGS="$(HOST_CFLAGS) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE" \ LDFLAGS="$(HOST_LDFLAGS)" \ + ARCH=arm \ futil cgpt endef From dd09d500aa6972808b2549e4b8c7fa4e396ca91f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 5 Nov 2017 11:49:58 +0100 Subject: [PATCH 28/42] mesa3d: fix build with BR2_SHARED_STATIC_LIBS mesa3d does not allow to enable both static and shared libraries so if BR2_SHARED_STATIC_LIBS is set, disable static Fixes https://bugs.busybox.net/show_bug.cgi?id=10326 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mesa3d/mesa3d.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 9305523bdf..5627344f02 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -26,6 +26,12 @@ MESA3D_DEPENDENCIES = \ # Disable assembly usage. MESA3D_CONF_OPTS = --disable-asm +# Disable static, otherwise configure will fail with: "Cannot enable both static +# and shared." +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +MESA3D_CONF_OPTS += --disable-static +endif + # The Sourcery MIPS toolchain has a special (non-upstream) feature to # have "compact exception handling", which unfortunately breaks with # mesa3d, so we disable it here by passing -mno-compact-eh. From 7feaac43718bdfff056e35ffdeec424bf03f1e9c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 11 Nov 2017 23:18:23 +0100 Subject: [PATCH 29/42] wpa_supplicant: mesh support needs openssl When BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING is enabeld, wpa_supplicant currently fails to build with: ../src/common/sae.o: In function `sae_cn_confirm.isra.2': sae.c:(.text+0x168): undefined reference to `crypto_bignum_to_bin' sae.c:(.text+0x198): undefined reference to `crypto_bignum_to_bin' ../src/common/sae.o: In function `sae_cn_confirm_ffc': sae.c:(.text+0x214): undefined reference to `crypto_bignum_to_bin' sae.c:(.text+0x22c): undefined reference to `crypto_bignum_to_bin' ../src/common/sae.o: In function `sae_cn_confirm_ecc': sae.c:(.text+0x2a4): undefined reference to `crypto_ec_point_to_bin' sae.c:(.text+0x2c0): undefined reference to `crypto_ec_point_to_bin' [...] This is due to the fact that the SAE code, used for the mesh network support, needs OpenSSL support. Therefore, we ensure that BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING selects OpenSSL. Only OpenSSL is supported, which is why BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL is selected as well. No changes to the .mk files are needed, because we were already handling OpenSSL as an optional dependency. This problem was not yet caught by the autobuilders. Reported-by: Maxime Ripard Cc: Maxime Ripard Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/wpa_supplicant/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/wpa_supplicant/Config.in b/package/wpa_supplicant/Config.in index 4b810bf1a8..de03141e40 100644 --- a/package/wpa_supplicant/Config.in +++ b/package/wpa_supplicant/Config.in @@ -48,6 +48,8 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING bool "Enable mesh networking" depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT + select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL help Enable support for open and secured mesh networking (IEEE 802.11s) From 3c8dc542936484cf94efd06d96161c8a04fb17a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Nov 2017 13:54:11 +0100 Subject: [PATCH 30/42] package/imagemagick: security bump to version 7.0.7-10 Version 7.0.7-3 fixes CVE-2017-15218: Stop potential leaks in the JNG decoder Changelog: https://www.imagemagick.org/script/changelog.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/imagemagick/imagemagick.hash | 2 +- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 92880a9aec..2468bdbc23 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 5a45e29509dbb23793a9c8db5c47ef1114c1ee82c9ca60053eaf06b3fc243e2c 7.0.7-1.tar.gz +sha256 924d1161ed2399bcb72f98419072b3130a466e07d9a6fce43d27458ffa907ffa 7.0.7-10.tar.gz diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 9043ce8e5e..c2171a7564 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.7-1 +IMAGEMAGICK_VERSION = 7.0.7-10 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From f2c353054111b0398399ba1933a47d34441c875e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 12 Nov 2017 14:43:11 +0100 Subject: [PATCH 31/42] ruby: security bump to version 2.4.2 Fixed the following security issues: CVE-2017-0898: Buffer underrun vulnerability in Kernel.sprintf CVE-2017-10784: Escape sequence injection vulnerability in the Basic authentication of WEBrick CVE-2017-14033: Buffer underrun vulnerability in OpenSSL ASN1 decode CVE-2017-14064: Heap exposure in generating JSON For more details, see the release notes: https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/ Drop now upstreamed rubygems patches and add hashes for the license files while we're at it. Signed-off-by: Peter Korsgaard --- package/ruby/0001-rubygems-2612-ruby24.patch | 445 ------------------- package/ruby/0002-rubygems-2613-ruby24.patch | 364 --------------- package/ruby/ruby.hash | 8 +- package/ruby/ruby.mk | 2 +- 4 files changed, 7 insertions(+), 812 deletions(-) delete mode 100644 package/ruby/0001-rubygems-2612-ruby24.patch delete mode 100644 package/ruby/0002-rubygems-2613-ruby24.patch diff --git a/package/ruby/0001-rubygems-2612-ruby24.patch b/package/ruby/0001-rubygems-2612-ruby24.patch deleted file mode 100644 index ebbefffbed..0000000000 --- a/package/ruby/0001-rubygems-2612-ruby24.patch +++ /dev/null @@ -1,445 +0,0 @@ -[PATCH] bump rubygems to 2.6.12 - -Downloaded from upstream: -https://bugs.ruby-lang.org/attachments/download/6692/rubygems-2612-ruby24.patch - -And converted to patch-p1. - -Signed-off-by: Peter Korsgaard -diff --git a/lib/rubygems.rb b/lib/rubygems.rb -index 5cd1a4c47a..bc5bf9b4c2 100644 ---- a/lib/rubygems.rb -+++ b/lib/rubygems.rb -@@ -10,7 +10,7 @@ - require 'thread' - - module Gem -- VERSION = "2.6.11" -+ VERSION = "2.6.12" - end - - # Must be first since it unloads the prelude from 1.9.2 -@@ -234,6 +234,7 @@ def self.needs - - def self.finish_resolve(request_set=Gem::RequestSet.new) - request_set.import Gem::Specification.unresolved_deps.values -+ request_set.import Gem.loaded_specs.values.map {|s| Gem::Dependency.new(s.name, s.version) } - - request_set.resolve_current.each do |s| - s.full_spec.activate -diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb -index a89b7421e3..059635e835 100644 ---- a/lib/rubygems/commands/open_command.rb -+++ b/lib/rubygems/commands/open_command.rb -@@ -72,7 +72,7 @@ def open_editor path - end - - def spec_for name -- spec = Gem::Specification.find_all_by_name(name, @version).last -+ spec = Gem::Specification.find_all_by_name(name, @version).first - - return spec if spec - -diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb -index f25d120b88..70f8127292 100644 ---- a/lib/rubygems/commands/query_command.rb -+++ b/lib/rubygems/commands/query_command.rb -@@ -86,7 +86,7 @@ def execute - name = Array(options[:name]) - else - args = options[:args].to_a -- name = options[:exact] ? args : args.map{|arg| /#{arg}/i } -+ name = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i } - end - - prerelease = options[:prerelease] -diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb -index 9832afd214..7e46963a4c 100644 ---- a/lib/rubygems/commands/sources_command.rb -+++ b/lib/rubygems/commands/sources_command.rb -@@ -44,7 +44,7 @@ def add_source source_uri # :nodoc: - source = Gem::Source.new source_uri - - begin -- if Gem.sources.include? source_uri then -+ if Gem.sources.include? source then - say "source #{source_uri} already present in the cache" - else - source.load_specs :released -diff --git a/lib/rubygems/dependency_list.rb b/lib/rubygems/dependency_list.rb -index 35fe7c4c1a..d8314eaf60 100644 ---- a/lib/rubygems/dependency_list.rb -+++ b/lib/rubygems/dependency_list.rb -@@ -104,7 +104,7 @@ def find_name(full_name) - end - - def inspect # :nodoc: -- "#<%s:0x%x %p>" % [self.class, object_id, map { |s| s.full_name }] -+ "%s %p>" % [super[0..-2], map { |s| s.full_name }] - end - - ## -diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb -index f4d3e728de..967543c2d1 100644 ---- a/lib/rubygems/installer.rb -+++ b/lib/rubygems/installer.rb -@@ -214,7 +214,7 @@ def check_executable_overwrite filename # :nodoc: - - ruby_executable = true - existing = io.read.slice(%r{ -- ^( -+ ^\s*( - gem \s | - load \s Gem\.bin_path\( | - load \s Gem\.activate_bin_path\( -@@ -701,6 +701,8 @@ def verify_gem_home(unpack = false) # :nodoc: - # Return the text for an application file. - - def app_script_text(bin_file_name) -+ # note that the `load` lines cannot be indented, as old RG versions match -+ # against the beginning of the line - return <<-TEXT - #{shebang bin_file_name} - # -@@ -723,7 +725,12 @@ def app_script_text(bin_file_name) - end - end - -+if Gem.respond_to?(:activate_bin_path) - load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version) -+else -+gem #{spec.name.dump}, version -+load Gem.bin_path(#{spec.name.dump}, #{bin_file_name.dump}, version) -+end - TEXT - end - -diff --git a/lib/rubygems/platform.rb b/lib/rubygems/platform.rb -index d22d91ae54..2dd9ed5782 100644 ---- a/lib/rubygems/platform.rb -+++ b/lib/rubygems/platform.rb -@@ -112,7 +112,7 @@ def initialize(arch) - end - - def inspect -- "#<%s:0x%x @cpu=%p, @os=%p, @version=%p>" % [self.class, object_id, *to_a] -+ "%s @cpu=%p, @os=%p, @version=%p>" % [super[0..-2], *to_a] - end - - def to_a -diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb -index 119d6d56f7..6963ca156f 100644 ---- a/lib/rubygems/security.rb -+++ b/lib/rubygems/security.rb -@@ -455,7 +455,7 @@ def self.create_cert_self_signed subject, key, age = ONE_YEAR, - - ## - # Creates a new key pair of the specified +length+ and +algorithm+. The -- # default is a 2048 bit RSA key. -+ # default is a 3072 bit RSA key. - - def self.create_key length = KEY_LENGTH, algorithm = KEY_ALGORITHM - algorithm.new length -diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb -index 81df0e608e..df4eb566d3 100644 ---- a/lib/rubygems/server.rb -+++ b/lib/rubygems/server.rb -@@ -657,7 +657,7 @@ def root(req, res) - "only_one_executable" => true, - "full_name" => "rubygems-#{Gem::VERSION}", - "has_deps" => false, -- "homepage" => "http://docs.rubygems.org/", -+ "homepage" => "http://guides.rubygems.org/", - "name" => 'rubygems', - "ri_installed" => true, - "summary" => "RubyGems itself", -diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb -index a2f289d162..500f0af768 100644 ---- a/lib/rubygems/specification.rb -+++ b/lib/rubygems/specification.rb -@@ -2105,7 +2105,7 @@ def inspect # :nodoc: - if $DEBUG - super - else -- "#<#{self.class}:0x#{__id__.to_s(16)} #{full_name}>" -+ "#{super[0..-2]} #{full_name}>" - end - end - -diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb -index 86b68e1efb..4e48f1eb4c 100644 ---- a/lib/rubygems/test_case.rb -+++ b/lib/rubygems/test_case.rb -@@ -484,7 +484,7 @@ def git_gem name = 'a', version = 1 - - system @git, 'add', gemspec - system @git, 'commit', '-a', '-m', 'a non-empty commit message', '--quiet' -- head = Gem::Util.popen('git', 'rev-parse', 'master').strip -+ head = Gem::Util.popen(@git, 'rev-parse', 'master').strip - end - - return name, git_spec.version, directory, head -@@ -1498,6 +1498,8 @@ def self.key_path key_name - begin - gem 'rdoc' - require 'rdoc' -+ -+ require 'rubygems/rdoc' - rescue LoadError, Gem::LoadError - end - -@@ -1514,3 +1516,4 @@ def self.key_path key_name - pid = $$ - END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid} - Gem.clear_paths -+Gem.loaded_specs.clear -diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb -index a605f9cdfe..62b36dfd41 100644 ---- a/test/rubygems/test_gem.rb -+++ b/test/rubygems/test_gem.rb -@@ -75,6 +75,29 @@ def test_self_finish_resolve_wtf - end - end - -+ def test_self_finish_resolve_respects_loaded_specs -+ save_loaded_features do -+ a1 = new_spec "a", "1", "b" => "> 0" -+ b1 = new_spec "b", "1", "c" => ">= 1" -+ b2 = new_spec "b", "2", "c" => ">= 2" -+ c1 = new_spec "c", "1" -+ c2 = new_spec "c", "2" -+ -+ install_specs c1, c2, b1, b2, a1 -+ -+ a1.activate -+ c1.activate -+ -+ assert_equal %w(a-1 c-1), loaded_spec_names -+ assert_equal ["b (> 0)"], unresolved_names -+ -+ Gem.finish_resolve -+ -+ assert_equal %w(a-1 b-1 c-1), loaded_spec_names -+ assert_equal [], unresolved_names -+ end -+ end -+ - def test_self_install - spec_fetcher do |f| - f.gem 'a', 1 -@@ -492,7 +515,7 @@ def test_self_find_files_with_gemfile - skip if RUBY_VERSION <= "1.8.7" - - cwd = File.expand_path("test/rubygems", @@project_dir) -- $LOAD_PATH.unshift cwd -+ actual_load_path = $LOAD_PATH.unshift(cwd).dup - - discover_path = File.join 'lib', 'sff', 'discover.rb' - -@@ -518,12 +541,12 @@ def test_self_find_files_with_gemfile - expected = [ - File.expand_path('test/rubygems/sff/discover.rb', @@project_dir), - File.join(foo1.full_gem_path, discover_path) -- ] -+ ].sort - -- assert_equal expected, Gem.find_files('sff/discover') -- assert_equal expected, Gem.find_files('sff/**.rb'), '[ruby-core:31730]' -+ assert_equal expected, Gem.find_files('sff/discover').sort -+ assert_equal expected, Gem.find_files('sff/**.rb').sort, '[ruby-core:31730]' - ensure -- assert_equal cwd, $LOAD_PATH.shift unless RUBY_VERSION <= "1.8.7" -+ assert_equal cwd, actual_load_path.shift unless RUBY_VERSION <= "1.8.7" - end - - def test_self_find_latest_files -diff --git a/test/rubygems/test_gem_commands_open_command.rb b/test/rubygems/test_gem_commands_open_command.rb -index 3ec38972e6..a96fa6ea23 100644 ---- a/test/rubygems/test_gem_commands_open_command.rb -+++ b/test/rubygems/test_gem_commands_open_command.rb -@@ -24,7 +24,8 @@ def test_execute - @cmd.options[:args] = %w[foo] - @cmd.options[:editor] = "#{Gem.ruby} -e0 --" - -- spec = gem 'foo' -+ gem 'foo', '1.0.0' -+ spec = gem 'foo', '1.0.1' - mock = MiniTest::Mock.new - mock.expect(:call, true, [spec.full_gem_path]) - -diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb -index 223f205b2d..d8d682b136 100644 ---- a/test/rubygems/test_gem_commands_query_command.rb -+++ b/test/rubygems/test_gem_commands_query_command.rb -@@ -642,7 +642,7 @@ def test_execute_local_details - assert_equal expected, @ui.output - end - -- def test_execute_exact -+ def test_execute_exact_remote - spec_fetcher do |fetcher| - fetcher.spec 'coolgem-omg', 3 - fetcher.spec 'coolgem', '4.2.1' -@@ -665,6 +665,60 @@ def test_execute_exact - assert_equal expected, @ui.output - end - -+ def test_execute_exact_local -+ spec_fetcher do |fetcher| -+ fetcher.spec 'coolgem-omg', 3 -+ fetcher.spec 'coolgem', '4.2.1' -+ fetcher.spec 'wow_coolgem', 1 -+ end -+ -+ @cmd.handle_options %w[--exact coolgem] -+ -+ use_ui @ui do -+ @cmd.execute -+ end -+ -+ expected = <<-EOF -+ -+*** LOCAL GEMS *** -+ -+coolgem (4.2.1) -+ EOF -+ -+ assert_equal expected, @ui.output -+ end -+ -+ def test_execute_exact_multiple -+ spec_fetcher do |fetcher| -+ fetcher.spec 'coolgem-omg', 3 -+ fetcher.spec 'coolgem', '4.2.1' -+ fetcher.spec 'wow_coolgem', 1 -+ -+ fetcher.spec 'othergem-omg', 3 -+ fetcher.spec 'othergem', '1.2.3' -+ fetcher.spec 'wow_othergem', 1 -+ end -+ -+ @cmd.handle_options %w[--exact coolgem othergem] -+ -+ use_ui @ui do -+ @cmd.execute -+ end -+ -+ expected = <<-EOF -+ -+*** LOCAL GEMS *** -+ -+coolgem (4.2.1) -+ -+*** LOCAL GEMS *** -+ -+othergem (1.2.3) -+ EOF -+ -+ assert_equal expected, @ui.output -+ end -+ - private - - def add_gems_to_fetcher -diff --git a/test/rubygems/test_gem_commands_sources_command.rb b/test/rubygems/test_gem_commands_sources_command.rb -index 014b4b4c12..d5b6d99419 100644 ---- a/test/rubygems/test_gem_commands_sources_command.rb -+++ b/test/rubygems/test_gem_commands_sources_command.rb -@@ -108,6 +108,58 @@ def test_execute_add_redundant_source - assert_equal '', @ui.error - end - -+ def test_execute_add_redundant_source_trailing_slash -+ # Remove pre-existing gem source (w/ slash) -+ repo_with_slash = "http://gems.example.com/" -+ @cmd.handle_options %W[--remove #{repo_with_slash}] -+ use_ui @ui do -+ @cmd.execute -+ end -+ source = Gem::Source.new repo_with_slash -+ assert_equal false, Gem.sources.include?(source) -+ -+ expected = <<-EOF -+#{repo_with_slash} removed from sources -+ EOF -+ -+ assert_equal expected, @ui.output -+ assert_equal '', @ui.error -+ -+ # Re-add pre-existing gem source (w/o slash) -+ repo_without_slash = "http://gems.example.com" -+ @cmd.handle_options %W[--add #{repo_without_slash}] -+ use_ui @ui do -+ @cmd.execute -+ end -+ source = Gem::Source.new repo_without_slash -+ assert_equal true, Gem.sources.include?(source) -+ -+ expected = <<-EOF -+http://gems.example.com/ removed from sources -+http://gems.example.com added to sources -+ EOF -+ -+ assert_equal expected, @ui.output -+ assert_equal '', @ui.error -+ -+ # Re-add original gem source (w/ slash) -+ @cmd.handle_options %W[--add #{repo_with_slash}] -+ use_ui @ui do -+ @cmd.execute -+ end -+ source = Gem::Source.new repo_with_slash -+ assert_equal true, Gem.sources.include?(source) -+ -+ expected = <<-EOF -+http://gems.example.com/ removed from sources -+http://gems.example.com added to sources -+source http://gems.example.com/ already present in the cache -+ EOF -+ -+ assert_equal expected, @ui.output -+ assert_equal '', @ui.error -+ end -+ - def test_execute_add_http_rubygems_org - http_rubygems_org = 'http://rubygems.org' - -diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb -index 6ceb2c6dfc..882981d344 100644 ---- a/test/rubygems/test_gem_installer.rb -+++ b/test/rubygems/test_gem_installer.rb -@@ -62,7 +62,12 @@ def test_app_script_text - end - end - -+if Gem.respond_to?(:activate_bin_path) - load Gem.activate_bin_path('a', 'executable', version) -+else -+gem "a", version -+load Gem.bin_path("a", "executable", version) -+end - EOF - - wrapper = @installer.app_script_text 'executable' -diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb -index dd606e44d4..936f78fb2a 100644 ---- a/test/rubygems/test_require.rb -+++ b/test/rubygems/test_require.rb -@@ -301,6 +301,17 @@ def test_default_gem_only - assert_equal %w(default-2.0.0.0), loaded_spec_names - end - -+ def test_realworld_default_gem -+ skip "no default gems on ruby < 2.0" unless RUBY_VERSION >= "2" -+ cmd = <<-RUBY -+ $stderr = $stdout -+ require "json" -+ puts Gem.loaded_specs["json"].default_gem? -+ RUBY -+ output = Gem::Util.popen(Gem.ruby, "-e", cmd).strip -+ assert_equal "true", output -+ end -+ - def test_default_gem_and_normal_gem - default_gem_spec = new_default_spec("default", "2.0.0.0", - nil, "default/gem.rb") diff --git a/package/ruby/0002-rubygems-2613-ruby24.patch b/package/ruby/0002-rubygems-2613-ruby24.patch deleted file mode 100644 index ea25d90347..0000000000 --- a/package/ruby/0002-rubygems-2613-ruby24.patch +++ /dev/null @@ -1,364 +0,0 @@ -[PATCH] bump rubygems to 2.6.12 - -Downloaded from upstream: -https://bugs.ruby-lang.org/attachments/download/6693/rubygems-2613-ruby24.patch - -And converted to patch-p1. - -Signed-off-by: Peter Korsgaard - -diff --git a/lib/rubygems.rb b/lib/rubygems.rb -index bc5bf9b4c2..55aa85b8b2 100644 ---- a/lib/rubygems.rb -+++ b/lib/rubygems.rb -@@ -10,7 +10,7 @@ - require 'thread' - - module Gem -- VERSION = "2.6.12" -+ VERSION = "2.6.13" - end - - # Must be first since it unloads the prelude from 1.9.2 -diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb -index 70f8127292..44144203e0 100644 ---- a/lib/rubygems/commands/query_command.rb -+++ b/lib/rubygems/commands/query_command.rb -@@ -226,7 +226,7 @@ def output_versions output, versions - end - end - -- output << make_entry(matching_tuples, platforms) -+ output << clean_text(make_entry(matching_tuples, platforms)) - end - end - -@@ -353,7 +353,8 @@ def spec_platforms entry, platforms - end - - def spec_summary entry, spec -- entry << "\n\n" << format_text(spec.summary, 68, 4) -+ summary = truncate_text(spec.summary, "the summary for #{spec.full_name}") -+ entry << "\n\n" << format_text(summary, 68, 4) - end - - end -diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb -index 967543c2d1..6fd3399dd4 100644 ---- a/lib/rubygems/installer.rb -+++ b/lib/rubygems/installer.rb -@@ -697,6 +697,11 @@ def verify_gem_home(unpack = false) # :nodoc: - unpack or File.writable?(gem_home) - end - -+ def verify_spec_name -+ return if spec.name =~ Gem::Specification::VALID_NAME_PATTERN -+ raise Gem::InstallError, "#{spec} has an invalid name" -+ end -+ - ## - # Return the text for an application file. - -@@ -823,6 +828,8 @@ def pre_install_checks - - ensure_loadable_spec - -+ verify_spec_name -+ - if options[:install_as_default] - Gem.ensure_default_gem_subdirectories gem_home - else -diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb -index e6a13d4b8c..8f0cf0b402 100644 ---- a/lib/rubygems/remote_fetcher.rb -+++ b/lib/rubygems/remote_fetcher.rb -@@ -110,7 +110,7 @@ def api_endpoint(uri) - else - target = res.target.to_s.strip - -- if /\.#{Regexp.quote(host)}\z/ =~ target -+ if URI("http://" + target).host.end_with?(".#{host}") - return URI.parse "#{uri.scheme}://#{target}#{uri.path}" - end - -diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb -index 500f0af768..88e320c05a 100644 ---- a/lib/rubygems/specification.rb -+++ b/lib/rubygems/specification.rb -@@ -108,6 +108,8 @@ class Gem::Specification < Gem::BasicSpecification - - private_constant :LOAD_CACHE if defined? private_constant - -+ VALID_NAME_PATTERN = /\A[a-zA-Z0-9\.\-\_]+\z/ # :nodoc: -+ - # :startdoc: - - ## -@@ -2671,9 +2673,15 @@ def validate packaging = true - end - end - -- unless String === name then -+ if !name.is_a?(String) then - raise Gem::InvalidSpecificationException, -- "invalid value for attribute name: \"#{name.inspect}\"" -+ "invalid value for attribute name: \"#{name.inspect}\" must be a string" -+ elsif name !~ /[a-zA-Z]/ then -+ raise Gem::InvalidSpecificationException, -+ "invalid value for attribute name: #{name.dump} must include at least one letter" -+ elsif name !~ VALID_NAME_PATTERN then -+ raise Gem::InvalidSpecificationException, -+ "invalid value for attribute name: #{name.dump} can only include letters, numbers, dashes, and underscores" - end - - if raw_require_paths.empty? then -diff --git a/lib/rubygems/text.rb b/lib/rubygems/text.rb -index 732f1b99f2..b944b62c27 100644 ---- a/lib/rubygems/text.rb -+++ b/lib/rubygems/text.rb -@@ -6,13 +6,26 @@ - - module Gem::Text - -+ ## -+ # Remove any non-printable characters and make the text suitable for -+ # printing. -+ def clean_text(text) -+ text.gsub(/[\000-\b\v-\f\016-\037\177]/, ".".freeze) -+ end -+ -+ def truncate_text(text, description, max_length = 100_000) -+ raise ArgumentError, "max_length must be positive" unless max_length > 0 -+ return text if text.size <= max_length -+ "Truncating #{description} to #{max_length.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse} characters:\n" + text[0, max_length] -+ end -+ - ## - # Wraps +text+ to +wrap+ characters and optionally indents by +indent+ - # characters - - def format_text(text, wrap, indent=0) - result = [] -- work = text.dup -+ work = clean_text(text) - - while work.length > wrap do - if work =~ /^(.{0,#{wrap}})[ \n]/ then -diff --git a/test/rubygems/test_gem_commands_query_command.rb b/test/rubygems/test_gem_commands_query_command.rb -index d8d682b136..469223c6c0 100644 ---- a/test/rubygems/test_gem_commands_query_command.rb -+++ b/test/rubygems/test_gem_commands_query_command.rb -@@ -116,6 +116,86 @@ def test_execute_details - This is a lot of text. This is a lot of text. This is a lot of text. - This is a lot of text. - -+pl (1) -+ Platform: i386-linux -+ Author: A User -+ Homepage: http://example.com -+ -+ this is a summary -+ EOF -+ -+ assert_equal expected, @ui.output -+ assert_equal '', @ui.error -+ end -+ -+ def test_execute_details_cleans_text -+ spec_fetcher do |fetcher| -+ fetcher.spec 'a', 2 do |s| -+ s.summary = 'This is a lot of text. ' * 4 -+ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] -+ s.homepage = "http://a.example.com/\x03" -+ end -+ -+ fetcher.legacy_platform -+ end -+ -+ @cmd.handle_options %w[-r -d] -+ -+ use_ui @ui do -+ @cmd.execute -+ end -+ -+ expected = <<-EOF -+ -+*** REMOTE GEMS *** -+ -+a (2) -+ Authors: Abraham Lincoln ., . Hirohito -+ Homepage: http://a.example.com/. -+ -+ This is a lot of text. This is a lot of text. This is a lot of text. -+ This is a lot of text. -+ -+pl (1) -+ Platform: i386-linux -+ Author: A User -+ Homepage: http://example.com -+ -+ this is a summary -+ EOF -+ -+ assert_equal expected, @ui.output -+ assert_equal '', @ui.error -+ end -+ -+ def test_execute_details_truncates_summary -+ spec_fetcher do |fetcher| -+ fetcher.spec 'a', 2 do |s| -+ s.summary = 'This is a lot of text. ' * 10_000 -+ s.authors = ["Abraham Lincoln \x01", "\x02 Hirohito"] -+ s.homepage = "http://a.example.com/\x03" -+ end -+ -+ fetcher.legacy_platform -+ end -+ -+ @cmd.handle_options %w[-r -d] -+ -+ use_ui @ui do -+ @cmd.execute -+ end -+ -+ expected = <<-EOF -+ -+*** REMOTE GEMS *** -+ -+a (2) -+ Authors: Abraham Lincoln ., . Hirohito -+ Homepage: http://a.example.com/. -+ -+ Truncating the summary for a-2 to 100,000 characters: -+#{" This is a lot of text. This is a lot of text. This is a lot of text.\n" * 1449} This is a lot of te -+ - pl (1) - Platform: i386-linux - Author: A User -diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb -index 882981d344..dd049214fb 100644 ---- a/test/rubygems/test_gem_installer.rb -+++ b/test/rubygems/test_gem_installer.rb -@@ -1448,6 +1448,26 @@ def test_pre_install_checks_wrong_rubygems_version - end - end - -+ def test_pre_install_checks_malicious_name -+ spec = util_spec '../malicious', '1' -+ def spec.full_name # so the spec is buildable -+ "malicious-1" -+ end -+ def spec.validate; end -+ -+ util_build_gem spec -+ -+ gem = File.join(@gemhome, 'cache', spec.file_name) -+ -+ use_ui @ui do -+ @installer = Gem::Installer.at gem -+ e = assert_raises Gem::InstallError do -+ @installer.pre_install_checks -+ end -+ assert_equal '# has an invalid name', e.message -+ end -+ end -+ - def test_shebang - util_make_exec @spec, "#!/usr/bin/ruby" - -diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb -index cb994462cd..fbb7d89019 100644 ---- a/test/rubygems/test_gem_remote_fetcher.rb -+++ b/test/rubygems/test_gem_remote_fetcher.rb -@@ -241,6 +241,21 @@ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original - dns.verify - end - -+ def test_api_endpoint_ignores_trans_domain_values_that_end_with_original_in_path -+ uri = URI.parse "http://example.com/foo" -+ target = MiniTest::Mock.new -+ target.expect :target, "evil.com/a.example.com" -+ -+ dns = MiniTest::Mock.new -+ dns.expect :getresource, target, [String, Object] -+ -+ fetch = Gem::RemoteFetcher.new nil, dns -+ assert_equal URI.parse("http://example.com/foo"), fetch.api_endpoint(uri) -+ -+ target.verify -+ dns.verify -+ end -+ - def test_api_endpoint_timeout_warning - uri = URI.parse "http://gems.example.com/foo" - -diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb -index d43289d745..0fcc11e78f 100644 ---- a/test/rubygems/test_gem_specification.rb -+++ b/test/rubygems/test_gem_specification.rb -@@ -2985,7 +2985,37 @@ def test_validate_name - @a1.validate - end - -- assert_equal 'invalid value for attribute name: ":json"', e.message -+ assert_equal 'invalid value for attribute name: ":json" must be a string', e.message -+ -+ @a1.name = [] -+ e = assert_raises Gem::InvalidSpecificationException do -+ @a1.validate -+ end -+ assert_equal "invalid value for attribute name: \"[]\" must be a string", e.message -+ -+ @a1.name = "" -+ e = assert_raises Gem::InvalidSpecificationException do -+ @a1.validate -+ end -+ assert_equal "invalid value for attribute name: \"\" must include at least one letter", e.message -+ -+ @a1.name = "12345" -+ e = assert_raises Gem::InvalidSpecificationException do -+ @a1.validate -+ end -+ assert_equal "invalid value for attribute name: \"12345\" must include at least one letter", e.message -+ -+ @a1.name = "../malicious" -+ e = assert_raises Gem::InvalidSpecificationException do -+ @a1.validate -+ end -+ assert_equal "invalid value for attribute name: \"../malicious\" can only include letters, numbers, dashes, and underscores", e.message -+ -+ @a1.name = "\ba\t" -+ e = assert_raises Gem::InvalidSpecificationException do -+ @a1.validate -+ end -+ assert_equal "invalid value for attribute name: \"\\ba\\t\" can only include letters, numbers, dashes, and underscores", e.message - end - - def test_validate_non_nil -diff --git a/test/rubygems/test_gem_text.rb b/test/rubygems/test_gem_text.rb -index a6e22e04da..04f3f605e8 100644 ---- a/test/rubygems/test_gem_text.rb -+++ b/test/rubygems/test_gem_text.rb -@@ -36,6 +36,10 @@ def test_format_text_trailing # for two spaces after . - assert_equal expected, format_text(text, 78) - end - -+ def test_format_removes_nonprintable_characters -+ assert_equal "text with weird .. stuff .", format_text("text with weird \x1b\x02 stuff \x7f", 40) -+ end -+ - def test_min3 - assert_equal 1, min3(1, 1, 1) - assert_equal 1, min3(1, 1, 2) -@@ -74,4 +78,11 @@ def test_levenshtein_distance_replace - assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest") - assert_equal 7, levenshtein_distance("zentest", "xxxxxxx") - end -+ -+ def test_truncate_text -+ assert_equal "abc", truncate_text("abc", "desc") -+ assert_equal "Truncating desc to 2 characters:\nab", truncate_text("abc", "desc", 2) -+ s = "ab" * 500_001 -+ assert_equal "Truncating desc to 1,000,000 characters:\n#{s[0, 1_000_000]}", truncate_text(s, "desc", 1_000_000) -+ end - end diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 624ce40f57..d066186d56 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,2 +1,6 @@ -# From https://www.ruby-lang.org/en/news/2017/03/22/ruby-2-4-1-released/ -sha256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 ruby-2.4.1.tar.xz +# From https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/ +sha256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 ruby-2.4.2.tar.xz +# License files, Locally calculated +sha256 5cda9584acd5e1096276a375085b7e659fa67a072fd69ec2c3931e54f7f563bb LEGAL +sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864 COPYING +sha256 a5e3042dacb53eebda91f3b1caefbfec8307711df8c4ed1ed20e4e97c43307a4 BSDL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index 3302811890..4bf1a14cee 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 2.4 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).2 RUBY_VERSION_EXT = 2.4.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From 1b9c562dfdac123e707dc8283338b11b24832ba7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Nov 2017 15:17:50 +0100 Subject: [PATCH 32/42] python-numpy: remove trailing whitespace Remove trailing whitespace introduced by commit 855002f22b4795b7ff3e37880c3ed65011cd036c ("python-numpy: reformat BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS") Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python-numpy/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index 1405218b1c..aa47087d28 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -4,14 +4,14 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # ARC toolchain issues for ARCompact default y if BR2_arc && !(BR2_arc770d || BR2_arc750d) default y if BR2_aarch64 - default y if BR2_arm + default y if BR2_arm default y if BR2_armeb - default y if BR2_i386 + default y if BR2_i386 default y if BR2_mips default y if BR2_mipsel default y if BR2_powerpc - default y if BR2_powerpc64 - default y if BR2_sh + default y if BR2_powerpc64 + default y if BR2_sh default y if BR2_x86_64 config BR2_PACKAGE_PYTHON_NUMPY From 1c0c55c0288775d8139facbacf651c67ecd397ba Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Nov 2017 15:17:51 +0100 Subject: [PATCH 33/42] python-numpy: also disable ARC HS with glibc Building python-numpy on ARC HS with glibc fails due to missing FE_* definitions in . Therefore, python-numpy is only available on ARC HS with a C library other than glibc. Fixes: http://autobuild.buildroot.net/results/6b9a3310bb4f8c1fd7db0ef4476458b3eec2bf2e/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/python-numpy/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/python-numpy/Config.in b/package/python-numpy/Config.in index aa47087d28..067085bf41 100644 --- a/package/python-numpy/Config.in +++ b/package/python-numpy/Config.in @@ -1,8 +1,9 @@ config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS bool # Numpy has some CPU specific code - # ARC toolchain issues for ARCompact - default y if BR2_arc && !(BR2_arc770d || BR2_arc750d) + # ARCompact build fails due to toolchain issue + # ARC HS38 build fails on glibc due to missing FE_* definitions + default y if BR2_arc && BR2_archs38 && !BR2_TOOLCHAIN_USES_GLIBC default y if BR2_aarch64 default y if BR2_arm default y if BR2_armeb From 8cd840b7e821aa777e835ec11d7a3762f0b33443 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Nov 2017 18:22:06 +0100 Subject: [PATCH 34/42] package/ffmpeg: fix typo "nios" -> "nios2" Typo added recently by https://git.buildroot.net/buildroot/commit/package/ffmpeg?id=bd2544d3d3903935fc4dc0ec9c930720441e545f Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/ffmpeg/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 487ca449c8..2d94c5712a 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW depends on !(BR2_archs38 && BR2_TOOLCHAIN_USES_GLIBC) # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - depends on !BR2_nios + depends on !BR2_nios2 # No support for ARMv7-M in the ARM assembly logic depends on !BR2_ARM_CPU_ARMV7M # Microblaze build affected by gcc PR71124 (infinite loop) From 1c219d396e31551785731b0ff7adb38782431b03 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 09:13:23 +0100 Subject: [PATCH 35/42] package/freerdp: drop dependency on host-pkgconf Currently, we only depend on host-pkgconf for gstreamer-0.x However, we also need it at least for gstreamer-1.x and waylabnd, too. But since FreeRDP is a cmake package, host-pkgconf is always pulled in as a dependency by the cmake-package infrastructure. So, drop the gstreamer-conditional host-pkgconf dependency. Signed-off-by: "Yann E. MORIN" Cc: Samuel Martin Reviewed-by: Thomas Petazzoni Acked-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 382cd39647..6d1664b86e 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -16,7 +16,7 @@ FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y) FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 host-pkgconf +FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 else FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF endif From 57c0ac59a54a82ccec7473bd7e126daf15ae71a2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 09:13:24 +0100 Subject: [PATCH 36/42] package/freerdp: optional systemd's journald support FreeRDP now has support for writing to the journal, so we must ensure proper dependency and correct options. Partially fixes: http://autobuild.buildroot.org/results/81aa66ddd88919295ccb5f34b527b737627263a7/ Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Reviewed-by: Thomas Petazzoni Reviewed-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 6d1664b86e..458bd5eea7 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -56,6 +56,14 @@ else FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF endif +# For the systemd journal +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +FREERDP_CONF_OPTS += -DWITH_LIBSYSTEMD=ON +FREERDP_DEPENDENCIES += systemd +else +FREERDP_CONF_OPTS += -DWITH_LIBSYSTEMD=OFF +endif + ifeq ($(BR2_ARM_CPU_HAS_NEON),y) FREERDP_CONF_OPTS += -DWITH_NEON=ON else From 45f0c11aaab8eff3c8c041936b64931f66fc8a8d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 09:13:25 +0100 Subject: [PATCH 37/42] package/freerdp: fix gstreamer-1.x detection Backport a patch from upstream. Partially fixes: http://autobuild.buildroot.org/results/81aa66ddd88919295ccb5f34b527b737627263a7/ Signed-off-by: "Yann E. MORIN" Reviewed-by: Thomas Petazzoni Reviewed-by: Samuel Martin Signed-off-by: Peter Korsgaard --- .../0001-Fix-gstreamer-1.0-detection.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/freerdp/0001-Fix-gstreamer-1.0-detection.patch diff --git a/package/freerdp/0001-Fix-gstreamer-1.0-detection.patch b/package/freerdp/0001-Fix-gstreamer-1.0-detection.patch new file mode 100644 index 0000000000..fadfe117a4 --- /dev/null +++ b/package/freerdp/0001-Fix-gstreamer-1.0-detection.patch @@ -0,0 +1,28 @@ +From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 28 Jul 2017 16:31:41 -0400 +Subject: [PATCH 1/1] Fix gstreamer-1.0 detection + +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: "Yann E. MORIN" + +--- + cmake/FindGStreamer_1_0.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake +index 3aa8fc6dc..6fbc0ecc5 100644 +--- a/cmake/FindGStreamer_1_0.cmake ++++ b/cmake/FindGStreamer_1_0.cmake +@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library) + + string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}") + if ("${CMAKE_MATCH_2}" STREQUAL "") +- pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}") ++ pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}") + else () + pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) + endif () +-- +2.11.0 + From c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 09:13:26 +0100 Subject: [PATCH 38/42] package/freerdp: fix build of wayland client Currently, FreeRDP uses pkg-config to find whether wayland is available. When it is, it gets the CFLAGS and LDFLAGS and so on from pkg-config, which is OK. But I also gets the path to the wayland scanner from pkg-config. And this points to the target one, when we really need the host one. So we force-feed the correct path as a configure option. Furthermore, wayland support needs libxkbcommon, so add this missing dependency as well. Fixes: http://autobuild.buildroot.org/results/bdfe233ade36a56d0f65ef3c3d1698fca548beed/ Signed-off-by: "Yann E. MORIN" Reviewed-by: Thomas Petazzoni Reviewed-by: Samuel Martin Signed-off-by: Peter Korsgaard --- package/freerdp/Config.in | 1 + package/freerdp/freerdp.mk | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/freerdp/Config.in b/package/freerdp/Config.in index 9dd2505a44..59bc18b672 100644 --- a/package/freerdp/Config.in +++ b/package/freerdp/Config.in @@ -81,6 +81,7 @@ config BR2_PACKAGE_FREERDP_CLIENT_WL bool "wayland client" default y depends on BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_LIBXKBCOMMON endif diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 458bd5eea7..69a89a190c 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -199,8 +199,10 @@ FREERDP_CONF_OPTS += -DWITH_XV=OFF endif ifeq ($(BR2_PACKAGE_WAYLAND),y) -FREERDP_DEPENDENCIES += wayland -FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON +FREERDP_DEPENDENCIES += wayland libxkbcommon +FREERDP_CONF_OPTS += \ + -DWITH_WAYLAND=ON \ + -DWAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner else FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF endif From dbd9915caa884073e4a644086a5783fb687d76f0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 12 Nov 2017 10:00:00 +0100 Subject: [PATCH 39/42] package/libplist: needs threads Upstream added a mandatory pthread check: https://github.com/libimobiledevice/libplist/commit/eec2e855b4f192cb1808d1f02b6bc8935a979025 Fixes http://autobuild.buildroot.net/results/863/863bb43db222f8e63d60b1fc4a53299575727de1/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libplist/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libplist/Config.in b/package/libplist/Config.in index 4a9575f545..5a246b4ecd 100644 --- a/package/libplist/Config.in +++ b/package/libplist/Config.in @@ -1,11 +1,12 @@ config BR2_PACKAGE_LIBPLIST bool "libplist" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help libplist is a client for manipulating Apple Property List (.plist) files http://www.libimobiledevice.org/ -comment "libplist needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libplist needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS From 8d44fb66085723b87efd8d111db50fdba7fa63ea Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Sun, 12 Nov 2017 00:06:31 +0100 Subject: [PATCH 40/42] libpjsip: fix static build failures due to name clash Several packages have a similar md5.c file, and each has a function named byteReverse(). This generates link errors when building statically ("multiple definition of `byteReverse'"). Fix by applying a patch from upstream: https://trac.pjsip.org/repos/changeset/5688 Fixes: http://autobuild.buildroot.org/results/5d7/5d72e0f8517a555399978d5a0e9f7efd0a278189/ http://autobuild.buildroot.org/results/c47/c47ccbb9b40011cf0d79c7040bed061ddefd9629/ http://autobuild.buildroot.org/results/419/419ab2c0e034cc68991281c51caa8271b0fadbab/ Signed-off-by: Luca Ceresoli Cc: Adam Duskett Signed-off-by: Peter Korsgaard --- ...1-Fixed-possible-function-name-clash.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/libpjsip/0001-Fixed-possible-function-name-clash.patch diff --git a/package/libpjsip/0001-Fixed-possible-function-name-clash.patch b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch new file mode 100644 index 0000000000..435b0eab54 --- /dev/null +++ b/package/libpjsip/0001-Fixed-possible-function-name-clash.patch @@ -0,0 +1,26 @@ +Re #2059 (misc): Fixed possible function name clash with md5 due to non-static function. + +Backported from: https://trac.pjsip.org/repos/changeset/5688 +Signed-off-by: Luca Ceresoli + +Index: pjlib-util/src/pjlib-util/md5.c +=================================================================== +diff --git a/pjproject/pjlib-util/src/pjlib-util/md5.c b/pjproject/pjlib-util/src/pjlib-util/md5.c +--- a/pjlib-util/src/pjlib-util/md5.c (revision 5687) ++++ b/pjlib-util/src/pjlib-util/md5.c (revision 5688) +@@ -29,13 +29,13 @@ + #ifndef HIGHFIRST + #define byteReverse(buf, len) /* Nothing */ + #else +-void byteReverse(unsigned char *buf, unsigned longs); ++static void byteReverse(unsigned char *buf, unsigned longs); + + #ifndef ASM_MD5 + /* + * Note: this code is harmless on little-endian machines. + */ +-void byteReverse(unsigned char *buf, unsigned longs) ++static void byteReverse(unsigned char *buf, unsigned longs) + { + pj_uint32_t t; + do { From 6d97e73257ffb9fddb8a57dc8d2933b79b86f4b0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 13 Nov 2017 20:23:49 +0100 Subject: [PATCH 41/42] package/x11r7/xapp_xdriinfo: fix libgl dependency Fixes "mesa3d is in the dependency chain of xapp_xdriinfo that has added it to its _DEPENDENCIES variable without selecting it or depending on it from Config.in." http://autobuild.buildroot.net/results/d8a/d8aeed2f64e21a277eb0bc5dc08d2339a14c682e/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk index bb00d3ba07..ffab5170dc 100644 --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk @@ -9,6 +9,6 @@ XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDRIINFO_LICENSE = MIT XAPP_XDRIINFO_LICENSE_FILES = COPYING -XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d +XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xproto_glproto $(eval $(autotools-package)) From 071cc43892f4a6c0b26b7a145f844acde31e7ee0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 13 Nov 2017 22:28:15 +0100 Subject: [PATCH 42/42] Update for 2017.11-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 15 +++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 22 ++++++++++++++++++++++ 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index a9f3365bf1..c0595f698f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +2017.11-rc2, Released November 13th, 2017 + + Fixes all over the tree. + + Updated/fixed packages: collectd, ffmpeg, freerdp, + go-bootstrap, imagemagick, jimtcl, libpjsip, libplist, libuv, + mesa3d, nodejs, ntp, openjpeg, postgresql, python-numpy, ruby, + snmp++, usb_modeswitch, util-linux, vboot-utils, webkitgtk, + wireshark, wpa_supplicant, xapp_xdriinfo + + Issues resolved (http://bugs.buildroot.org): + + #10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y + #10491: Cannot output security warning when compiled with buildroot.. + 2017.11-rc1, Released November 6th, 2017 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index 9240d0aeeb..55409b99af 100644 --- a/Makefile +++ b/Makefile @@ -87,9 +87,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2017.11-rc1 +export BR2_VERSION := 2017.11-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1510000000 +BR2_VERSION_EPOCH = 1510608000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/docs/website/download.html b/docs/website/download.html index 5c8a51b7f9..a7842b46d4 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@ -

Latest release candidate: 2017.11-rc1

+

Latest release candidate: 2017.11-rc2

- +
- +
-

buildroot-2017.11-rc1.tar.gz

-

PGP signature

+

buildroot-2017.11-rc2.tar.gz

+

PGP signature

- +
- +
-

buildroot-2017.11-rc1.tar.bz2

-

PGP signature

+

buildroot-2017.11-rc2.tar.bz2

+

PGP signature

diff --git a/docs/website/news.html b/docs/website/news.html index bbb4cb9958..f2186f2963 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

News